From: Patrick Steuer <patrick.steuer@de.ibm.com>
Date: Thu, 1 Aug 2019 08:59:14 +0000 (+0200)
Subject: Fix commit a672a02a s390x build breakage
X-Git-Tag: openssl-3.0.0-alpha1~1679
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=2b2eb210a1365f80a125cebdd05ed567cb3ca7cf;p=oweals%2Fopenssl.git

Fix commit a672a02a s390x build breakage

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

Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/9501)
---

diff --git a/providers/common/ciphers/gcm_s390x.c b/providers/common/ciphers/gcm_s390x.c
index 0ced60037d..68b06c870a 100644
--- a/providers/common/ciphers/gcm_s390x.c
+++ b/providers/common/ciphers/gcm_s390x.c
@@ -42,14 +42,14 @@ static int s390x_aes_gcm_setiv(PROV_GCM_CTX *ctx, const unsigned char *iv,
     actx->plat.s390x.areslen = 0;
     actx->plat.s390x.kreslen = 0;
 
-    if (ivlen == AES_GCM_IV_DEFAULT_SIZE) {
+    if (ivlen == GCM_IV_DEFAULT_SIZE) {
         memcpy(&kma->j0, iv, ivlen);
         kma->j0.w[3] = 1;
         kma->cv.w = 1;
     } else {
         unsigned long long ivbits = ivlen << 3;
         size_t len = S390X_gcm_ivpadlen(ivlen);
-        unsigned char iv_zero_pad[S390X_gcm_ivpadlen(AES_GCM_IV_MAX_SIZE)];
+        unsigned char iv_zero_pad[S390X_gcm_ivpadlen(GCM_IV_MAX_SIZE)];
         /*
          * The IV length needs to be zero padded to be a multiple of 16 bytes
          * followed by 8 bytes of zeros and 8 bytes for the IV length.
@@ -93,7 +93,7 @@ static int s390x_aes_gcm_cipher_final(PROV_GCM_CTX *ctx, unsigned char *tag)
     OPENSSL_cleanse(out, actx->plat.s390x.mreslen);
 
     if (ctx->enc) {
-        ctx->taglen = AES_GCM_TAG_MAX_SIZE;
+        ctx->taglen = GCM_TAG_MAX_SIZE;
         memcpy(tag, kma->t.b, ctx->taglen);
         rc = 1;
     } else {