|
 |
a5ef24 |
From 9ab3ce124616cb12bd39c6aa1e1bde0f46969b29 Mon Sep 17 00:00:00 2001
|
|
|
a5ef24 |
From: Andy Polyakov <appro@openssl.org>
|
|
|
a5ef24 |
Date: Mon, 18 Mar 2013 19:29:41 +0100
|
|
|
a5ef24 |
Subject: [PATCH] e_aes_cbc_hmac_sha1.c: fix rare bad record mac on AES-NI
|
|
|
a5ef24 |
plaforms.
|
|
|
a5ef24 |
|
|
|
a5ef24 |
PR: 3002
|
|
|
a5ef24 |
(cherry picked from commit 5c60046553716fcf160718f59160493194f212dc)
|
|
|
a5ef24 |
---
|
|
|
a5ef24 |
crypto/evp/e_aes_cbc_hmac_sha1.c | 5 +++--
|
|
|
a5ef24 |
1 file changed, 3 insertions(+), 2 deletions(-)
|
|
|
a5ef24 |
|
|
|
a5ef24 |
diff --git a/crypto/evp/e_aes_cbc_hmac_sha1.c b/crypto/evp/e_aes_cbc_hmac_sha1.c
|
|
|
a5ef24 |
index 483e04b..fb2c884 100644
|
|
|
a5ef24 |
--- a/crypto/evp/e_aes_cbc_hmac_sha1.c
|
|
|
a5ef24 |
+++ b/crypto/evp/e_aes_cbc_hmac_sha1.c
|
|
|
a5ef24 |
@@ -328,10 +328,11 @@ static int aesni_cbc_hmac_sha1_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
|
|
|
a5ef24 |
|
|
|
a5ef24 |
if (res!=SHA_CBLOCK) continue;
|
|
|
a5ef24 |
|
|
|
a5ef24 |
- mask = 0-((inp_len+8-j)>>(sizeof(j)*8-1));
|
|
|
a5ef24 |
+ /* j is not incremented yet */
|
|
|
a5ef24 |
+ mask = 0-((inp_len+7-j)>>(sizeof(j)*8-1));
|
|
|
a5ef24 |
data->u[SHA_LBLOCK-1] |= bitlen&mas;;
|
|
|
a5ef24 |
sha1_block_data_order(&key->md,data,1);
|
|
|
a5ef24 |
- mask &= 0-((j-inp_len-73)>>(sizeof(j)*8-1));
|
|
|
a5ef24 |
+ mask &= 0-((j-inp_len-72)>>(sizeof(j)*8-1));
|
|
|
a5ef24 |
pmac->u[0] |= key->md.h0 & mask;
|
|
|
a5ef24 |
pmac->u[1] |= key->md.h1 & mask;
|
|
|
a5ef24 |
pmac->u[2] |= key->md.h2 & mask;
|
|
|
a5ef24 |
--
|
|
|
a5ef24 |
1.7.9.5
|
|
|
a5ef24 |
|