summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@cvs.openbsd.org>2012-10-13 21:23:42 +0000
committerDamien Miller <djm@cvs.openbsd.org>2012-10-13 21:23:42 +0000
commit000dc57bd5917f82d72bd113e7762e1376be384f (patch)
tree604cecbe4d5b664910aecf120bc1b0e7dd8fb2b0
parent97d71e4f2fd535b45e54400fff7c23b9be975edf (diff)
import OpenSSL-1.0.1c
-rw-r--r--lib/libssl/src/crypto/modes/ccm128.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/libssl/src/crypto/modes/ccm128.c b/lib/libssl/src/crypto/modes/ccm128.c
index 3ce11d0d984..c9b35e5b35e 100644
--- a/lib/libssl/src/crypto/modes/ccm128.c
+++ b/lib/libssl/src/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
- ctx->nonce.u[1] = 0;
+ *(u32*)(&ctx->nonce.c[8]) = 0;
ctx->nonce.c[12] = (u8)(mlen>>24);
ctx->nonce.c[13] = (u8)(mlen>>16);