Fix s390x build errors and warnings

Signed-off-by: Patrick Steuer <patrick.steuer@de.ibm.com>
Reviewed-by: Tim Hudson <tjh@openssl.org>
Reviewed-by: Shane Lontis <shane.lontis@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/9236)

diff --git a/providers/common/digests/sha3_prov.c b/providers/common/digests/sha3_prov.c
index 278ddfb8559e9ccfa5bdf594095824ccbd89b97e..15cd670a0efd8580970978a93e9ad1637f229f6c 100644 (file)
--- a/providers/common/digests/sha3_prov.c
+++ b/providers/common/digests/sha3_prov.c
@@ -142,6 +142,7 @@ static int s390x_sha3_final(unsigned char *md, void *vctx)
 
     s390x_klmd(ctx->buf, ctx->bufsz, NULL, 0, ctx->pad, ctx->A);
     memcpy(md, ctx->A, ctx->md_size);
+    return 1;
 }
 
 static int s390x_shake_final(unsigned char *md, void *vctx)
@@ -184,7 +185,7 @@ static void *name##_newctx(void *provctx) \
     if (ctx == NULL) \
         return NULL; \
     sha3_init(ctx, pad, bitlen); \
-    SHA3_SET_MD(name, typ) \
+    SHA3_SET_MD(uname, typ) \
     return ctx; \
 }