[openssl] master update

[shane.lontis at oracle.com]

The branch master has been updated
       via  be1dc984e1a5938170188cbdb6e536f1e7ac1656 (commit)
      from  6f92692bd9df27a8902336a4c6db9eb7e00d23ba (commit)


- Log -----------------------------------------------------------------
commit be1dc984e1a5938170188cbdb6e536f1e7ac1656
Author: Patrick Steuer <patrick.steuer at de.ibm.com>
Date:   Tue Jun 25 00:10:20 2019 +0200

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

-----------------------------------------------------------------------

Summary of changes:
 providers/common/digests/sha3_prov.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/providers/common/digests/sha3_prov.c b/providers/common/digests/sha3_prov.c
index 278ddfb..15cd670 100644
--- 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; \
 }