From: Thomas Pornin <pornin@bolet.org>
Date: Sun, 20 Aug 2017 21:19:51 +0000 (+0200)
Subject: Some more extra casts to avoid alignment warnings with Clang and -Wcast-align on... 
X-Git-Tag: v0.6~25
X-Git-Url: https://bearssl.org/gitweb//home/git/?p=BearSSL;a=commitdiff_plain;h=a52cff8309f48ca8487410cfa2a8fb6c11152e2b;ds=sidebyside

Some more extra casts to avoid alignment warnings with Clang and -Wcast-align on 32-bit systems with 64-bit alignment requirements (e.g. ARMv7).
---

diff --git a/src/x509/x509_minimal.c b/src/x509/x509_minimal.c
index ea14ad2..ddf2515 100644
--- a/src/x509/x509_minimal.c
+++ b/src/x509/x509_minimal.c
@@ -249,7 +249,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 +272,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 +288,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 +302,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 +314,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 +332,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;
 	}
diff --git a/src/x509/x509_minimal.t0 b/src/x509/x509_minimal.t0
index bce37ad..a46076e 100644
--- a/src/x509/x509_minimal.t0
+++ b/src/x509/x509_minimal.t0
@@ -198,7 +198,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;
@@ -221,7 +221,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;
 	}
@@ -237,7 +237,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;
 	}
@@ -251,7 +251,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;
 	}
@@ -263,7 +263,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;
@@ -281,14 +281,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;
 	}