The branch master has been updated via a74b2eda2fcc386e85c6f859729631b0642c4ee6 (commit) from 682b6f67472c22ad2e750c3398d0c49b13c7f5dd (commit)
- Log ----------------------------------------------------------------- commit a74b2eda2fcc386e85c6f859729631b0642c4ee6 Author: Patrick Steuer <patrick.ste...@de.ibm.com> Date: Wed Sep 18 15:46:39 2019 +0200 Fix strict-warnings build ..which was broken for s390 due to 1c3ace68. Signed-off-by: Patrick Steuer <patrick.ste...@de.ibm.com> Reviewed-by: Kurt Roeckx <k...@roeckx.be> (Merged from https://github.com/openssl/openssl/pull/9937) ----------------------------------------------------------------------- Summary of changes: providers/common/ciphers/cipher_aes_gcm_hw_s390x.inc | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) 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; }