[openssl] master update

[shane.lontis at oracle.com]

The branch master has been updated
       via  dbca036435e210348e73d43a8dad14f0de6a9a18 (commit)
      from  3f8907e459313f0b3df3b328f0a16db565fbcea0 (commit)


- Log -----------------------------------------------------------------
commit dbca036435e210348e73d43a8dad14f0de6a9a18
Author: Shane Lontis <shane.lontis at oracle.com>
Date:   Tue Nov 19 08:38:19 2019 +1000

    fix s390 compile error due to missing comma.
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/10467)

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

Summary of changes:
 providers/implementations/ciphers/cipher_aes_hw_s390x.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/providers/implementations/ciphers/cipher_aes_hw_s390x.inc b/providers/implementations/ciphers/cipher_aes_hw_s390x.inc
index f60ca9cba8..56e2dc9e38 100644
--- a/providers/implementations/ciphers/cipher_aes_hw_s390x.inc
+++ b/providers/implementations/ciphers/cipher_aes_hw_s390x.inc
@@ -193,7 +193,7 @@ static int s390x_aes_cfb8_cipher_hw(PROV_CIPHER_CTX *dat, unsigned char *out,
 #define PROV_CIPHER_HW_declare(mode)                                           \
 static const PROV_CIPHER_HW s390x_aes_##mode = {                               \
     s390x_aes_##mode##_initkey,                                                \
-    s390x_aes_##mode##_cipher_hw                                               \
+    s390x_aes_##mode##_cipher_hw,                                              \
     cipher_hw_aes_copyctx                                                      \
 };
 #define PROV_CIPHER_HW_select(mode)                                            \