j3d1/bearssl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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).

Browse source
This commit is contained in:
Thomas Pornin 2017-08-20 23:19:51 +02:00
parent 8e86598b33
commit a52cff8309
2 changed files with 14 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/x509/x509_minimal.c
View file

@ -249,7 +249,7 @@ xm_start_chain(const br_x509_class **ctx, const char *server_name)
br_x509_minimal_context *cc; br_x509_minimal_context *cc;
size_t u; 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 ++) { for (u = 0; u < cc->num_name_elts; u ++) {
cc->name_elts[u].status = 0; cc->name_elts[u].status = 0;
cc->name_elts[u].buf[0] = 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; br_x509_minimal_context *cc;
cc = (br_x509_minimal_context *)ctx; cc = (br_x509_minimal_context *)(void *)ctx;
if (cc->err != 0) { if (cc->err != 0) {
return; return;
} }
@ -288,7 +288,7 @@ xm_append(const br_x509_class **ctx, const unsigned char *buf, size_t len)
{ {
br_x509_minimal_context *cc; br_x509_minimal_context *cc;
cc = (br_x509_minimal_context *)ctx; cc = (br_x509_minimal_context *)(void *)ctx;
if (cc->err != 0) { if (cc->err != 0) {
return; return;
} }
@ -302,7 +302,7 @@ xm_end_cert(const br_x509_class **ctx)
{ {
br_x509_minimal_context *cc; 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) { if (cc->err == 0 && cc->cert_length != 0) {
cc->err = BR_ERR_X509_TRUNCATED; cc->err = BR_ERR_X509_TRUNCATED;
} }
@ -314,7 +314,7 @@ xm_end_chain(const br_x509_class **ctx)
{ {
br_x509_minimal_context *cc; br_x509_minimal_context *cc;
cc = (br_x509_minimal_context *)ctx; cc = (br_x509_minimal_context *)(void *)ctx;
if (cc->err == 0) { if (cc->err == 0) {
if (cc->num_certs == 0) { if (cc->num_certs == 0) {
cc->err = BR_ERR_X509_EMPTY_CHAIN; 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; 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 if (cc->err == BR_ERR_X509_OK
|| cc->err == BR_ERR_X509_NOT_TRUSTED) || cc->err == BR_ERR_X509_NOT_TRUSTED)
{ {
if (usages != NULL) { if (usages != NULL) {
*usages = cc->key_usages; *usages = cc->key_usages;
} }
return &((br_x509_minimal_context *)ctx)->pkey; return &((br_x509_minimal_context *)(void *)ctx)->pkey;
} else { } else {
return NULL; return NULL;
} }

14
src/x509/x509_minimal.t0
View file

@ -198,7 +198,7 @@ xm_start_chain(const br_x509_class **ctx, const char *server_name)
br_x509_minimal_context *cc; br_x509_minimal_context *cc;
size_t u; 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 ++) { for (u = 0; u < cc->num_name_elts; u ++) {
cc->name_elts[u].status = 0; cc->name_elts[u].status = 0;
cc->name_elts[u].buf[0] = 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; br_x509_minimal_context *cc;
cc = (br_x509_minimal_context *)ctx; cc = (br_x509_minimal_context *)(void *)ctx;
if (cc->err != 0) { if (cc->err != 0) {
return; return;
} }
@ -237,7 +237,7 @@ xm_append(const br_x509_class **ctx, const unsigned char *buf, size_t len)
{ {
br_x509_minimal_context *cc; br_x509_minimal_context *cc;
cc = (br_x509_minimal_context *)ctx; cc = (br_x509_minimal_context *)(void *)ctx;
if (cc->err != 0) { if (cc->err != 0) {
return; return;
} }
@ -251,7 +251,7 @@ xm_end_cert(const br_x509_class **ctx)
{ {
br_x509_minimal_context *cc; 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) { if (cc->err == 0 && cc->cert_length != 0) {
cc->err = BR_ERR_X509_TRUNCATED; cc->err = BR_ERR_X509_TRUNCATED;
} }
@ -263,7 +263,7 @@ xm_end_chain(const br_x509_class **ctx)
{ {
br_x509_minimal_context *cc; br_x509_minimal_context *cc;
cc = (br_x509_minimal_context *)ctx; cc = (br_x509_minimal_context *)(void *)ctx;
if (cc->err == 0) { if (cc->err == 0) {
if (cc->num_certs == 0) { if (cc->num_certs == 0) {
cc->err = BR_ERR_X509_EMPTY_CHAIN; 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; 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 if (cc->err == BR_ERR_X509_OK
|| cc->err == BR_ERR_X509_NOT_TRUSTED) || cc->err == BR_ERR_X509_NOT_TRUSTED)
{ {
if (usages != NULL) { if (usages != NULL) {
*usages = cc->key_usages; *usages = cc->key_usages;
} }
return &((br_x509_minimal_context *)ctx)->pkey; return &((br_x509_minimal_context *)(void *)ctx)->pkey;
} else { } else {
return NULL; return NULL;
} }