From ffdbac52cefc51575797aab100de824f0586450e Mon Sep 17 00:00:00 2001 From: Frank Denis Date: Thu, 19 Jun 2014 19:39:50 -0700 Subject: [PATCH] poly1305_state_internal_t alignment is fine; add intermediary void * cast. --- .../crypto_onetimeauth/poly1305/donna/auth_poly1305_donna.c | 2 +- .../crypto_onetimeauth/poly1305/donna/poly1305_donna32.h | 4 ++-- .../crypto_onetimeauth/poly1305/donna/poly1305_donna64.h | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/libsodium/crypto_onetimeauth/poly1305/donna/auth_poly1305_donna.c b/src/libsodium/crypto_onetimeauth/poly1305/donna/auth_poly1305_donna.c index 76c801db..d1d29e18 100644 --- a/src/libsodium/crypto_onetimeauth/poly1305/donna/auth_poly1305_donna.c +++ b/src/libsodium/crypto_onetimeauth/poly1305/donna/auth_poly1305_donna.c @@ -10,7 +10,7 @@ static void poly1305_update(poly1305_context *ctx, const unsigned char *m, unsigned long long bytes) { - poly1305_state_internal_t *st = (poly1305_state_internal_t *)ctx; + poly1305_state_internal_t *st = (poly1305_state_internal_t *)(void *)ctx; unsigned long long i; /* handle leftover */ diff --git a/src/libsodium/crypto_onetimeauth/poly1305/donna/poly1305_donna32.h b/src/libsodium/crypto_onetimeauth/poly1305/donna/poly1305_donna32.h index 4fc5c9da..0aceb826 100644 --- a/src/libsodium/crypto_onetimeauth/poly1305/donna/poly1305_donna32.h +++ b/src/libsodium/crypto_onetimeauth/poly1305/donna/poly1305_donna32.h @@ -45,7 +45,7 @@ U32TO8(unsigned char *p, unsigned long v) { static void poly1305_init(poly1305_context *ctx, const unsigned char key[32]) { - poly1305_state_internal_t *st = (poly1305_state_internal_t *)ctx; + poly1305_state_internal_t *st = (poly1305_state_internal_t *)(void *)ctx; /* r &= 0xffffffc0ffffffc0ffffffc0fffffff */ st->r[0] = (U8TO32(&key[ 0]) ) & 0x3ffffff; @@ -134,7 +134,7 @@ poly1305_blocks(poly1305_state_internal_t *st, const unsigned char *m, unsigned static POLY1305_NOINLINE void poly1305_finish(poly1305_context *ctx, unsigned char mac[16]) { - poly1305_state_internal_t *st = (poly1305_state_internal_t *)ctx; + poly1305_state_internal_t *st = (poly1305_state_internal_t *)(void *)ctx; unsigned long h0,h1,h2,h3,h4,c; unsigned long g0,g1,g2,g3,g4; unsigned long long f; diff --git a/src/libsodium/crypto_onetimeauth/poly1305/donna/poly1305_donna64.h b/src/libsodium/crypto_onetimeauth/poly1305/donna/poly1305_donna64.h index c6d2bf4e..d92c3ee5 100644 --- a/src/libsodium/crypto_onetimeauth/poly1305/donna/poly1305_donna64.h +++ b/src/libsodium/crypto_onetimeauth/poly1305/donna/poly1305_donna64.h @@ -59,7 +59,7 @@ U64TO8(unsigned char *p, unsigned long long v) { static void poly1305_init(poly1305_context *ctx, const unsigned char key[32]) { - poly1305_state_internal_t *st = (poly1305_state_internal_t *)ctx; + poly1305_state_internal_t *st = (poly1305_state_internal_t *)(void *)ctx; unsigned long long t0,t1; /* r &= 0xffffffc0ffffffc0ffffffc0fffffff */ @@ -138,7 +138,7 @@ poly1305_blocks(poly1305_state_internal_t *st, const unsigned char *m, unsigned static POLY1305_NOINLINE void poly1305_finish(poly1305_context *ctx, unsigned char mac[16]) { - poly1305_state_internal_t *st = (poly1305_state_internal_t *)ctx; + poly1305_state_internal_t *st = (poly1305_state_internal_t *)(void *)ctx; unsigned long long h0,h1,h2,c; unsigned long long g0,g1,g2; unsigned long long t0,t1;