From d5475e319575a45b20f560bdfae56cbfb165cb01 Mon Sep 17 00:00:00 2001 From: Matt Caswell Date: Mon, 17 Jul 2017 16:55:32 +0100 Subject: Remove some dead code The intention of the removed code was to check if the previous operation carried. However this does not work. The "mask" value always ends up being a constant and is all ones - thus it has no effect. This check is no longer required because of the previous commit. Reviewed-by: Rich Salz (Merged from https://github.com/openssl/openssl/pull/3832) --- crypto/evp/e_aes_cbc_hmac_sha256.c | 3 --- 1 file changed, 3 deletions(-) (limited to 'crypto/evp/e_aes_cbc_hmac_sha256.c') diff --git a/crypto/evp/e_aes_cbc_hmac_sha256.c b/crypto/evp/e_aes_cbc_hmac_sha256.c index 65fbb916fb..bca6e1018f 100644 --- a/crypto/evp/e_aes_cbc_hmac_sha256.c +++ b/crypto/evp/e_aes_cbc_hmac_sha256.c @@ -549,9 +549,6 @@ static int aesni_cbc_hmac_sha256_cipher(EVP_CIPHER_CTX *ctx, pad = constant_time_select(mask, pad, maxpad); inp_len = len - (SHA256_DIGEST_LENGTH + pad + 1); - mask = (0 - ((inp_len - len) >> (sizeof(inp_len) * 8 - 1))); - inp_len &= mask; - ret &= (int)mask; key->aux.tls_aad[plen - 2] = inp_len >> 8; key->aux.tls_aad[plen - 1] = inp_len; -- cgit v1.2.3