[openssl] master update

[tomas at openssl.org]

The branch master has been updated
       via  c39352e4e4952a9f4b2171134af0e015a4d40768 (commit)
      from  72f649e061bef86cbf41303fede1a61c9fe2c05b (commit)


- Log -----------------------------------------------------------------
commit c39352e4e4952a9f4b2171134af0e015a4d40768
Author: Juergen Christ <jchrist at linux.ibm.com>
Date:   Mon Apr 19 15:04:13 2021 +0200

    Fix compile errors on s390.
    
    Commit f6c95e46c03025b2694241e1ad785d8bd3ac083b added an "origin" field to
    EVP_CIPHER and EVP_MD structures but did not update the s390 specific
    implementations.  Update these to fix compile errors on s390.
    
    Signed-off-by: Juergen Christ <jchrist at linux.ibm.com>
    
    Reviewed-by: Patrick Steuer <patrick.steuer at de.ibm.com>
    Reviewed-by: Paul Dale <pauli at openssl.org>
    Reviewed-by: Tomas Mraz <tomas at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/14926)

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

Summary of changes:
 crypto/evp/e_aes.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/crypto/evp/e_aes.c b/crypto/evp/e_aes.c
index ffafdbcc22..91e8cd861c 100644
--- a/crypto/evp/e_aes.c
+++ b/crypto/evp/e_aes.c
@@ -2185,6 +2185,7 @@ static const EVP_CIPHER s390x_aes_##keylen##_##mode = {                 \
     keylen / 8,                                                         \
     ivlen,                                                              \
     flags | EVP_CIPH_##MODE##_MODE,                                     \
+    EVP_ORIG_GLOBAL,                                                    \
     s390x_aes_##mode##_init_key,                                        \
     s390x_aes_##mode##_cipher,                                          \
     NULL,                                                               \
@@ -2200,6 +2201,7 @@ static const EVP_CIPHER aes_##keylen##_##mode = {                       \
     keylen / 8,                                                         \
     ivlen,                                                              \
     flags | EVP_CIPH_##MODE##_MODE,                                     \
+    EVP_ORIG_GLOBAL,                                                    \
     aes_init_key,                                                       \
     aes_##mode##_cipher,                                                \
     NULL,                                                               \
@@ -2222,6 +2224,7 @@ static const EVP_CIPHER s390x_aes_##keylen##_##mode = {                 \
     (EVP_CIPH_##MODE##_MODE==EVP_CIPH_XTS_MODE||EVP_CIPH_##MODE##_MODE==EVP_CIPH_SIV_MODE ? 2 : 1) * keylen / 8,        \
     ivlen,                                                              \
     flags | EVP_CIPH_##MODE##_MODE,                                     \
+    EVP_ORIG_GLOBAL,                                                    \
     s390x_aes_##mode##_init_key,                                        \
     s390x_aes_##mode##_cipher,                                          \
     s390x_aes_##mode##_cleanup,                                         \
@@ -2236,6 +2239,7 @@ static const EVP_CIPHER aes_##keylen##_##mode = {                       \
     (EVP_CIPH_##MODE##_MODE==EVP_CIPH_XTS_MODE||EVP_CIPH_##MODE##_MODE==EVP_CIPH_SIV_MODE ? 2 : 1) * keylen / 8,        \
     ivlen,                                                              \
     flags | EVP_CIPH_##MODE##_MODE,                                     \
+    EVP_ORIG_GLOBAL,                                                    \
     aes_##mode##_init_key,                                              \
     aes_##mode##_cipher,                                                \
     aes_##mode##_cleanup,                                               \