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 /providers/implementations/ciphers | |
| 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 'providers/implementations/ciphers')
| -rw-r--r-- | providers/implementations/ciphers/cipher_aes_cbc_hmac_sha1_hw.c | 4 | ||||
| -rw-r--r-- | providers/implementations/ciphers/cipher_aes_cbc_hmac_sha256_hw.c | 6 |
2 files changed, 4 insertions, 6 deletions
diff --git a/providers/implementations/ciphers/cipher_aes_cbc_hmac_sha1_hw.c b/providers/implementations/ciphers/cipher_aes_cbc_hmac_sha1_hw.c index 5be237b485..bd1c611b42 100644 --- a/providers/implementations/ciphers/cipher_aes_cbc_hmac_sha1_hw.c +++ b/providers/implementations/ciphers/cipher_aes_cbc_hmac_sha1_hw.c @@ -603,8 +603,7 @@ static int aesni_cbc_hmac_sha1_cipher(PROV_CIPHER_CTX *vctx, 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) * @@ -614,7 +613,6 @@ static int aesni_cbc_hmac_sha1_cipher(PROV_CIPHER_CTX *vctx, res |= (c ^ pmac->c[i]) & cmask; i += 1 & cmask; } - maxpad -= SHA_DIGEST_LENGTH; res = 0 - ((0 - res) >> (sizeof(res) * 8 - 1)); ret &= (int)~res; diff --git a/providers/implementations/ciphers/cipher_aes_cbc_hmac_sha256_hw.c b/providers/implementations/ciphers/cipher_aes_cbc_hmac_sha256_hw.c index 03d06f8870..7001dfcd1c 100644 --- a/providers/implementations/ciphers/cipher_aes_cbc_hmac_sha256_hw.c +++ b/providers/implementations/ciphers/cipher_aes_cbc_hmac_sha256_hw.c @@ -655,8 +655,9 @@ static int aesni_cbc_hmac_sha256_cipher(PROV_CIPHER_CTX *vctx, size_t off = out - p; unsigned int c, cmask; - maxpad += SHA256_DIGEST_LENGTH; - for (res = 0, i = 0, j = 0; j < maxpad; j++) { + for (res = 0, i = 0, j = 0; + j < maxpad + SHA256_DIGEST_LENGTH; + j++) { c = p[j]; cmask = ((int)(j - off - SHA256_DIGEST_LENGTH)) >> @@ -666,7 +667,6 @@ static int aesni_cbc_hmac_sha256_cipher(PROV_CIPHER_CTX *vctx, res |= (c ^ pmac->c[i]) & cmask; i += 1 & cmask; } - maxpad -= SHA256_DIGEST_LENGTH; res = 0 - ((0 - res) >> (sizeof(res) * 8 - 1)); ret &= (int)~res; |