diff options
| author | Shane Lontis <shane.lontis@oracle.com> | 2019-09-19 10:40:07 +0200 |
|---|---|---|
| committer | Shane Lontis <shane.lontis@oracle.com> | 2019-09-20 04:25:28 +0200 |
| commit | 2e9645c8b9a81e7617395553088560847ac1b8c8 (patch) | |
| tree | 9a016607bd392574a39f56756958c9a2488628cc /providers/common/ciphers/cipher_gcm_hw.c | |
| parent | Exit non-zero if find-doc-nits finds nits (diff) | |
| download | openssl-2e9645c8b9a81e7617395553088560847ac1b8c8.tar.xz openssl-2e9645c8b9a81e7617395553088560847ac1b8c8.zip | |
Move gcm decryption tag check higher up in the callstack
Code was updated for s390 that accidently removed the check inside the final method.
Moving the check up before the final method is called is a better way of handling this.
The oneshot method also calls the final method but doesnt need to do this check.
Reviewed-by: Richard Levitte <levitte@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/9945)
Diffstat (limited to '')
| -rw-r--r-- | providers/common/ciphers/cipher_gcm_hw.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/providers/common/ciphers/cipher_gcm_hw.c b/providers/common/ciphers/cipher_gcm_hw.c index e2587f2e5e..8b2913c695 100644 --- a/providers/common/ciphers/cipher_gcm_hw.c +++ b/providers/common/ciphers/cipher_gcm_hw.c @@ -90,8 +90,7 @@ int gcm_cipher_final(PROV_GCM_CTX *ctx, unsigned char *tag) CRYPTO_gcm128_tag(&ctx->gcm, tag, GCM_TAG_MAX_SIZE); ctx->taglen = GCM_TAG_MAX_SIZE; } else { - if (ctx->taglen == UNINITIALISED_SIZET - || CRYPTO_gcm128_finish(&ctx->gcm, tag, ctx->taglen) != 0) + if (CRYPTO_gcm128_finish(&ctx->gcm, tag, ctx->taglen) != 0) return 0; } return 1; |