diff options
Diffstat (limited to 'lib/freebl/verified/Hacl_Chacha20Poly1305_32.c')
| -rw-r--r-- | lib/freebl/verified/Hacl_Chacha20Poly1305_32.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/lib/freebl/verified/Hacl_Chacha20Poly1305_32.c b/lib/freebl/verified/Hacl_Chacha20Poly1305_32.c index 760e3d548..493a31695 100644 --- a/lib/freebl/verified/Hacl_Chacha20Poly1305_32.c +++ b/lib/freebl/verified/Hacl_Chacha20Poly1305_32.c @@ -157,7 +157,7 @@ poly1305_padded_32(uint64_t *ctx, uint32_t len, uint8_t *text) uint8_t *last = blocks + nb * (uint32_t)16U; uint64_t e[5U] = { 0U }; uint8_t tmp[16U] = { 0U }; - memcpy(tmp, last, rem1 * sizeof(last[0U])); + memcpy(tmp, last, rem1 * sizeof(uint8_t)); uint64_t u0 = load64_le(tmp); uint64_t lo = u0; uint64_t u = load64_le(tmp + (uint32_t)8U); @@ -275,7 +275,7 @@ poly1305_padded_32(uint64_t *ctx, uint32_t len, uint8_t *text) acc0[4U] = o4; } uint8_t tmp[16U] = { 0U }; - memcpy(tmp, rem, r * sizeof(rem[0U])); + memcpy(tmp, rem, r * sizeof(uint8_t)); if (r > (uint32_t)0U) { uint64_t *pre = ctx + (uint32_t)5U; uint64_t *acc = ctx; @@ -411,7 +411,9 @@ poly1305_do_32( uint64_t ctx[25U] = { 0U }; uint8_t block[16U] = { 0U }; Hacl_Poly1305_32_poly1305_init(ctx, k); - poly1305_padded_32(ctx, aadlen, aad); + if (aadlen != (uint32_t)0U) { + poly1305_padded_32(ctx, aadlen, aad); + } poly1305_padded_32(ctx, mlen, m); store64_le(block, (uint64_t)aadlen); store64_le(block + (uint32_t)8U, (uint64_t)mlen); |