projects
/
BearSSL
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Some more extra casts to avoid alignment warnings with Clang and -Wcast-align on...
[BearSSL]
/
src
/
x509
/
x509_minimal.c
diff --git
a/src/x509/x509_minimal.c
b/src/x509/x509_minimal.c
index
a8283e3
..
ddf2515
100644
(file)
--- 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;
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;
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;
{
br_x509_minimal_context *cc;
- cc = (br_x509_minimal_context *)ctx;
+ cc = (br_x509_minimal_context *)
(void *)
ctx;
if (cc->err != 0) {
return;
}
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;
{
br_x509_minimal_context *cc;
- cc = (br_x509_minimal_context *)ctx;
+ cc = (br_x509_minimal_context *)
(void *)
ctx;
if (cc->err != 0) {
return;
}
if (cc->err != 0) {
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) {
cc->err = BR_ERR_X509_TRUNCATED;
}
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;
{
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;
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;
{
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;
}
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;
}
} else {
return NULL;
}
@@
-356,7
+356,7
@@
const br_x509_class br_x509_minimal_vtable = {
xm_get_pkey
};
xm_get_pkey
};
-#define CTX ((br_x509_minimal_context *)((unsigned char *)t0ctx - offsetof(br_x509_minimal_context, cpu)))
+#define CTX ((br_x509_minimal_context *)(
void *)(
(unsigned char *)t0ctx - offsetof(br_x509_minimal_context, cpu)))
#define CONTEXT_NAME br_x509_minimal_context
#define DNHASH_LEN ((CTX->dn_hash_impl->desc >> BR_HASHDESC_OUT_OFF) & BR_HASHDESC_OUT_MASK)
#define CONTEXT_NAME br_x509_minimal_context
#define DNHASH_LEN ((CTX->dn_hash_impl->desc >> BR_HASHDESC_OUT_OFF) & BR_HASHDESC_OUT_MASK)
@@
-1444,7
+1444,7
@@
br_x509_minimal_run(void *t0ctx)
/* get16 */
uint32_t addr = T0_POP();
/* get16 */
uint32_t addr = T0_POP();
- T0_PUSH(*(uint16_t *)((unsigned char *)CTX + addr));
+ T0_PUSH(*(uint16_t *)(
void *)(
(unsigned char *)CTX + addr));
}
break;
}
break;
@@
-1452,7
+1452,7
@@
br_x509_minimal_run(void *t0ctx)
/* get32 */
uint32_t addr = T0_POP();
/* get32 */
uint32_t addr = T0_POP();
- T0_PUSH(*(uint32_t *)((unsigned char *)CTX + addr));
+ T0_PUSH(*(uint32_t *)(
void *)(
(unsigned char *)CTX + addr));
}
break;
}
break;
@@
-1606,7
+1606,7
@@
br_x509_minimal_run(void *t0ctx)
/* set16 */
uint32_t addr = T0_POP();
/* set16 */
uint32_t addr = T0_POP();
- *(uint16_t *)((unsigned char *)CTX + addr) = T0_POP();
+ *(uint16_t *)(
void *)(
(unsigned char *)CTX + addr) = T0_POP();
}
break;
}
break;
@@
-1614,7
+1614,7
@@
br_x509_minimal_run(void *t0ctx)
/* set32 */
uint32_t addr = T0_POP();
/* set32 */
uint32_t addr = T0_POP();
- *(uint32_t *)((unsigned char *)CTX + addr) = T0_POP();
+ *(uint32_t *)(
void *)(
(unsigned char *)CTX + addr) = T0_POP();
}
break;
}
break;