summaryrefslogtreecommitdiff
path: root/usr/src
diff options
context:
space:
mode:
authormcpowers <none@none>2008-05-12 15:57:29 -0700
committermcpowers <none@none>2008-05-12 15:57:29 -0700
commit0d4a0bb3f17c7804d5070ef0b598571de5bfe91f (patch)
tree9bb43d8ad3356c41df955e1f79fdf2d8b75623e5 /usr/src
parente314c1b25a1c3ec434b6194614d9dbff72462046 (diff)
downloadillumos-joyent-0d4a0bb3f17c7804d5070ef0b598571de5bfe91f.tar.gz
6615681 aes-ccm failed with the ieee802.11i test case
Diffstat (limited to 'usr/src')
-rw-r--r--usr/src/common/crypto/aes/aes_cbc_crypt.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/usr/src/common/crypto/aes/aes_cbc_crypt.c b/usr/src/common/crypto/aes/aes_cbc_crypt.c
index 4c01b4f2d1..9cfb5aa8fb 100644
--- a/usr/src/common/crypto/aes/aes_cbc_crypt.c
+++ b/usr/src/common/crypto/aes/aes_cbc_crypt.c
@@ -19,7 +19,7 @@
* CDDL HEADER END
*/
/*
- * Copyright 2007 Sun Microsystems, Inc. All rights reserved.
+ * Copyright 2008 Sun Microsystems, Inc. All rights reserved.
* Use is subject to license terms.
*/
@@ -1250,6 +1250,7 @@ aes_ccm_format_initial_blocks(uchar_t *nonce, ulong_t nonceSize,
bzero(&(cb[1+nonceSize]), q);
/* Create the mask for the counter field based on the size of nonce */
+ q <<= 3;
while (q-- > 0) {
mask |= (1ULL << q);
}