From: Patrick Steuer <patrick.steuer@de.ibm.com>
Date: Wed, 18 Sep 2019 13:46:39 +0000 (+0200)
Subject: Fix strict-warnings build
X-Git-Tag: openssl-3.0.0-alpha1~1324
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=a74b2eda2fcc386e85c6f859729631b0642c4ee6;p=oweals%2Fopenssl.git

Fix strict-warnings build

..which was broken for s390 due to 1c3ace68.

Signed-off-by: Patrick Steuer <patrick.steuer@de.ibm.com>

Reviewed-by: Kurt Roeckx <kurt@roeckx.be>
(Merged from https://github.com/openssl/openssl/pull/9937)
---

diff --git a/providers/common/ciphers/cipher_aes_gcm_hw_s390x.inc b/providers/common/ciphers/cipher_aes_gcm_hw_s390x.inc
index ceb733db59..44c3bf332d 100644
--- a/providers/common/ciphers/cipher_aes_gcm_hw_s390x.inc
+++ b/providers/common/ciphers/cipher_aes_gcm_hw_s390x.inc
@@ -97,10 +97,7 @@ static int s390x_aes_gcm_cipher_final(PROV_GCM_CTX *ctx, unsigned char *tag)
         memcpy(tag, kma->t.b, ctx->taglen);
         rc = 1;
     } else {
-        if (ctx->taglen < 0)
-            rc = 0;
-        else
-            rc = (CRYPTO_memcmp(tag, kma->t.b, ctx->taglen) == 0);
+        rc = (CRYPTO_memcmp(tag, kma->t.b, ctx->taglen) == 0);
     }
     return rc;
 }