From: Juergen Christ Date: Mon, 19 Apr 2021 13:04:13 +0000 (+0200) Subject: Fix compile errors on s390. X-Git-Tag: openssl-3.0.0-alpha15~32 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c39352e4e4952a9f4b2171134af0e015a4d40768;p=thirdparty%2Fopenssl.git 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 Reviewed-by: Patrick Steuer Reviewed-by: Paul Dale Reviewed-by: Tomas Mraz (Merged from https://github.com/openssl/openssl/pull/14926) --- diff --git a/crypto/evp/e_aes.c b/crypto/evp/e_aes.c index ffafdbcc223..91e8cd861cd 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, \