summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDr. Stephen Henson <steve@openssl.org>2010-08-30 23:57:03 +0000
committerDr. Stephen Henson <steve@openssl.org>2010-08-30 23:57:03 +0000
commitae3b60ba99033ff06da382b764a9f50134e30806 (patch)
tree4e5ba18727977885b9dcf7002fa8d09ca4ec60bd
parentd4ba6424a18f270cb8ef4fe4fad3fdc789b132d1 (diff)
fix bug in AES_unwrap()
-rw-r--r--crypto/aes/aes_wrap.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/crypto/aes/aes_wrap.c b/crypto/aes/aes_wrap.c
index a9aebfe9b0..e2d73d37ce 100644
--- a/crypto/aes/aes_wrap.c
+++ b/crypto/aes/aes_wrap.c
@@ -119,9 +119,9 @@ int AES_unwrap_key(AES_KEY *key, const unsigned char *iv,
A[7] ^= (unsigned char)(t & 0xff);
if (t > 0xff)
{
- A[6] ^= (unsigned char)((t & 0xff) >> 8);
- A[5] ^= (unsigned char)((t & 0xff) >> 16);
- A[4] ^= (unsigned char)((t & 0xff) >> 24);
+ A[6] ^= (unsigned char)((t >> 8) & 0xff);
+ A[5] ^= (unsigned char)((t >> 16) & 0xff);
+ A[4] ^= (unsigned char)((t >> 24) & 0xff);
}
memcpy(B + 8, R, 8);
AES_decrypt(B, B, key);