diff options
| author | Pauli <paul.dale@oracle.com> | 2020-12-01 11:13:08 +1000 |
|---|---|---|
| committer | Pauli <paul.dale@oracle.com> | 2020-12-03 11:21:33 +1000 |
| commit | 7b42408756f53d38022363e2f0ac999db7d23a65 (patch) | |
| tree | 0f6b7ed81a98fc645fca03c529d9c27f0fe79381 /crypto/evp/e_aes_cbc_hmac_sha1.c | |
| parent | 30742e8e7f93f58964bf7619f9c1783e6b3b03fc (diff) | |
remove unused assignments
Reviewed-by: Tomas Mraz <tmraz@fedoraproject.org>
(Merged from https://github.com/openssl/openssl/pull/13577)
Diffstat (limited to 'crypto/evp/e_aes_cbc_hmac_sha1.c')
| -rw-r--r-- | crypto/evp/e_aes_cbc_hmac_sha1.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/crypto/evp/e_aes_cbc_hmac_sha1.c b/crypto/evp/e_aes_cbc_hmac_sha1.c index f787d014d2..cdf5985e8b 100644 --- a/crypto/evp/e_aes_cbc_hmac_sha1.c +++ b/crypto/evp/e_aes_cbc_hmac_sha1.c @@ -702,8 +702,7 @@ static int aesni_cbc_hmac_sha1_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out, size_t off = out - p; unsigned int c, cmask; - maxpad += SHA_DIGEST_LENGTH; - for (res = 0, i = 0, j = 0; j < maxpad; j++) { + for (res = 0, i = 0, j = 0; j < maxpad + SHA_DIGEST_LENGTH; j++) { c = p[j]; cmask = ((int)(j - off - SHA_DIGEST_LENGTH)) >> (sizeof(int) * @@ -713,7 +712,6 @@ static int aesni_cbc_hmac_sha1_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out, res |= (c ^ pmac->c[i]) & cmask; i += 1 & cmask; } - maxpad -= SHA_DIGEST_LENGTH; res = 0 - ((0 - res) >> (sizeof(res) * 8 - 1)); ret &= (int)~res; |