projects
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
crypto/modes: even more strict aliasing fixes [and fix bug in cbc128.c from
[openssl.git]
/
crypto
/
modes
/
ccm128.c
diff --git
a/crypto/modes/ccm128.c
b/crypto/modes/ccm128.c
index c9b35e5b35e58fd0c802e5b76c2158a3c3d3771f..3ce11d0d984cbcd34ea507e279677e775065843e 100644
(file)
--- a/
crypto/modes/ccm128.c
+++ b/
crypto/modes/ccm128.c
@@
-87,7
+87,7
@@
int CRYPTO_ccm128_setiv(CCM128_CONTEXT *ctx,
ctx->nonce.c[11] = (u8)(mlen>>(32%(sizeof(mlen)*8)));
}
else
-
*(u32*)(&ctx->nonce.c[8])
= 0;
+
ctx->nonce.u[1]
= 0;
ctx->nonce.c[12] = (u8)(mlen>>24);
ctx->nonce.c[13] = (u8)(mlen>>16);