X-Git-Url: https://www.bearssl.org/gitweb//home/git/?p=BearSSL;a=blobdiff_plain;f=src%2Fx509%2Fx509_minimal.c;h=3b876ef8198032bc1df6a00ab4ac4eb2fd567403;hp=ea14ad2e6523f83538f00f97d02602c0d41f771d;hb=f8e38c231dab636d8a1ece7f9eaa07bf09dfb049;hpb=8e86598b33f9df81d1f77d6cc32568d9ae119d67

diff --git a/src/x509/x509_minimal.c b/src/x509/x509_minimal.c
index ea14ad2..3b876ef 100644
--- a/src/x509/x509_minimal.c
+++ b/src/x509/x509_minimal.c
@@ -200,20 +200,6 @@ void br_x509_minimal_run(void *t0ctx);
  *  then validation is reported as failed.
  */
 
-#ifndef BR_USE_UNIX_TIME
-#if defined __unix__ || defined __linux__ \
-	|| defined _POSIX_SOURCE || defined _POSIX_C_SOURCE \
-	|| (defined __APPLE__ && defined __MACH__)
-#define BR_USE_UNIX_TIME   1
-#endif
-#endif
-
-#ifndef BR_USE_WIN32_TIME
-#if defined _WIN32 || defined _WIN64
-#define BR_USE_WIN32_TIME   1
-#endif
-#endif
-
 #if BR_USE_UNIX_TIME
 #include <time.h>
 #endif
@@ -249,7 +235,7 @@ xm_start_chain(const br_x509_class **ctx, const char *server_name)
 	br_x509_minimal_context *cc;
 	size_t u;
 
-	cc = (br_x509_minimal_context *)ctx;
+	cc = (br_x509_minimal_context *)(void *)ctx;
 	for (u = 0; u < cc->num_name_elts; u ++) {
 		cc->name_elts[u].status = 0;
 		cc->name_elts[u].buf[0] = 0;
@@ -272,7 +258,7 @@ xm_start_cert(const br_x509_class **ctx, uint32_t length)
 {
 	br_x509_minimal_context *cc;
 
-	cc = (br_x509_minimal_context *)ctx;
+	cc = (br_x509_minimal_context *)(void *)ctx;
 	if (cc->err != 0) {
 		return;
 	}
@@ -288,7 +274,7 @@ xm_append(const br_x509_class **ctx, const unsigned char *buf, size_t len)
 {
 	br_x509_minimal_context *cc;
 
-	cc = (br_x509_minimal_context *)ctx;
+	cc = (br_x509_minimal_context *)(void *)ctx;
 	if (cc->err != 0) {
 		return;
 	}
@@ -302,7 +288,7 @@ xm_end_cert(const br_x509_class **ctx)
 {
 	br_x509_minimal_context *cc;
 
-	cc = (br_x509_minimal_context *)ctx;
+	cc = (br_x509_minimal_context *)(void *)ctx;
 	if (cc->err == 0 && cc->cert_length != 0) {
 		cc->err = BR_ERR_X509_TRUNCATED;
 	}
@@ -314,7 +300,7 @@ xm_end_chain(const br_x509_class **ctx)
 {
 	br_x509_minimal_context *cc;
 
-	cc = (br_x509_minimal_context *)ctx;
+	cc = (br_x509_minimal_context *)(void *)ctx;
 	if (cc->err == 0) {
 		if (cc->num_certs == 0) {
 			cc->err = BR_ERR_X509_EMPTY_CHAIN;
@@ -332,14 +318,14 @@ xm_get_pkey(const br_x509_class *const *ctx, unsigned *usages)
 {
 	br_x509_minimal_context *cc;
 
-	cc = (br_x509_minimal_context *)ctx;
+	cc = (br_x509_minimal_context *)(void *)ctx;
 	if (cc->err == BR_ERR_X509_OK
 		|| cc->err == BR_ERR_X509_NOT_TRUSTED)
 	{
 		if (usages != NULL) {
 			*usages = cc->key_usages;
 		}
-		return &((br_x509_minimal_context *)ctx)->pkey;
+		return &((br_x509_minimal_context *)(void *)ctx)->pkey;
 	} else {
 		return NULL;
 	}