diff options
| author | Juergen Christ <jchrist@linux.ibm.com> | 2021-04-19 15:04:13 +0200 |
|---|---|---|
| committer | Tomas Mraz <tomas@openssl.org> | 2021-04-20 09:57:19 +0200 |
| commit | c39352e4e4952a9f4b2171134af0e015a4d40768 (patch) | |
| tree | b472d03b5fb5863141b39546c03a4a954d6685eb /crypto | |
| parent | 72f649e061bef86cbf41303fede1a61c9fe2c05b (diff) | |
| download | openssl-c39352e4e4952a9f4b2171134af0e015a4d40768.tar.gz | |
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@linux.ibm.com>
Reviewed-by: Patrick Steuer <patrick.steuer@de.ibm.com>
Reviewed-by: Paul Dale <pauli@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/14926)
Diffstat (limited to 'crypto')
| -rw-r--r-- | crypto/evp/e_aes.c | 4 |
1 files changed, 4 insertions, 0 deletions
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, \ |