[openssl] master update

[shane.lontis at oracle.com]

The branch master has been updated
       via  5723a8ec514930c7c49d080cd7a2b17a8f8c7afa (commit)
      from  47b422c90aec6e3d1de38110d67e17133d086051 (commit)


- Log -----------------------------------------------------------------
commit 5723a8ec514930c7c49d080cd7a2b17a8f8c7afa
Author: Shane Lontis <shane.lontis at oracle.com>
Date:   Thu Oct 22 11:07:58 2020 +1000

    Fix sparc t4 build error 'undefined symbol: cipher_hw_generic_cbc'
    
    cipher_hw_generic_##mode has been renamed to ossl_cipher_hw_generic_##mode.
    There were a few missing renames for t4 in .inc files.
    
    Reviewed-by: Matt Caswell <matt at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/13213)

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

Summary of changes:
 providers/implementations/ciphers/cipher_aes_hw_t4.inc      | 2 +-
 providers/implementations/ciphers/cipher_camellia_hw_t4.inc | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/providers/implementations/ciphers/cipher_aes_hw_t4.inc b/providers/implementations/ciphers/cipher_aes_hw_t4.inc
index 07b65789f1..60bee09842 100644
--- a/providers/implementations/ciphers/cipher_aes_hw_t4.inc
+++ b/providers/implementations/ciphers/cipher_aes_hw_t4.inc
@@ -88,7 +88,7 @@ static int cipher_hw_aes_t4_initkey(PROV_CIPHER_CTX *dat,
 #define PROV_CIPHER_HW_declare(mode)                                           \
 static const PROV_CIPHER_HW aes_t4_##mode = {                                  \
     cipher_hw_aes_t4_initkey,                                                  \
-    cipher_hw_generic_##mode,                                                  \
+    ossl_cipher_hw_generic_##mode,                                             \
     cipher_hw_aes_copyctx                                                      \
 };
 #define PROV_CIPHER_HW_select(mode)                                            \
diff --git a/providers/implementations/ciphers/cipher_camellia_hw_t4.inc b/providers/implementations/ciphers/cipher_camellia_hw_t4.inc
index 96e5e20dbc..803ffa7b7d 100644
--- a/providers/implementations/ciphers/cipher_camellia_hw_t4.inc
+++ b/providers/implementations/ciphers/cipher_camellia_hw_t4.inc
@@ -76,7 +76,7 @@ static int cipher_hw_camellia_t4_initkey(PROV_CIPHER_CTX *dat,
 #define PROV_CIPHER_HW_declare(mode)                                           \
 static const PROV_CIPHER_HW t4_camellia_##mode = {                             \
     cipher_hw_camellia_t4_initkey,                                             \
-    cipher_hw_generic_##mode,                                                  \
+    ossl_cipher_hw_generic_##mode,                                             \
     cipher_hw_camellia_copyctx                                                 \
 };
 #define PROV_CIPHER_HW_select(mode)                                            \