forked from pool/openssl-1_1
c29de1fbdc
Add million FIPS and s390 patches - Temporarily ignore broken OPENSSL_INIT_NO_ATEXIT due to our layered FIPS initialization * openssl-fips-ignore_broken_atexit_test.patch - Import FIPS patches from SLE-15 * openssl-fips-dont_run_FIPS_module_installed.patch * openssl-fips_mode.patch * openssl-ship_fips_standalone_hmac.patch * openssl-fips-clearerror.patch * openssl-fips-selftests_in_nonfips_mode.patch - Don't run FIPS power-up self-tests when the checksum files aren't installed (bsc#1042392) * add openssl-fips-run_selftests_only_when_module_is_complete.patch - Import FIPS patches from Fedora (bsc#1157702, jsc#SLE-9553) * openssl-1.1.1-fips-crng-test.patch * openssl-1.1.1-fips-post-rand.patch * openssl-1.1.1-fips.patch * openssl-1.1.0-issuer-hash.patch * openssl-1.1.1-evp-kdf.patch * openssl-1.1.1-ssh-kdf.patch replaces openssl-jsc-SLE-8789-backport_KDF.patch - Support for CPACF enhancements - part 1 (crypto) [bsc#1152695, jsc#SLE-7861] - Add patches: * openssl-s390x-assembly-pack-add-OPENSSL_s390xcap-environment.patch * openssl-s390x-assembly-pack-add-support-for-pcc-and-kma-inst.patch * openssl-s390x-assembly-pack-add-OPENSSL_s390xcap-man-page.patch * openssl-s390x-assembly-pack-update-OPENSSL_s390xcap-3.patch * openssl-s390xcpuid.pl-fix-comment.patch OBS-URL: https://build.opensuse.org/request/show/766865 OBS-URL: https://build.opensuse.org/package/show/security:tls/openssl-1_1?expand=0&rev=51
47 lines
2.0 KiB
Diff
47 lines
2.0 KiB
Diff
From ac037dc874a721ca81a33b4314e26cef4a7e8d48 Mon Sep 17 00:00:00 2001
|
|
From: Patrick Steuer <patrick.steuer@de.ibm.com>
|
|
Date: Tue, 24 Sep 2019 23:20:00 +0200
|
|
Subject: [PATCH 09529/10000] s390x assembly pack: fix OPENSSL_s390xcap z15 cpu
|
|
mask
|
|
|
|
Signed-off-by: Patrick Steuer <patrick.steuer@de.ibm.com>
|
|
|
|
Reviewed-by: Richard Levitte <levitte@openssl.org>
|
|
(Merged from https://github.com/openssl/openssl/pull/10004)
|
|
---
|
|
crypto/s390xcap.c | 10 +++++-----
|
|
1 file changed, 5 insertions(+), 5 deletions(-)
|
|
|
|
diff --git a/crypto/s390xcap.c b/crypto/s390xcap.c
|
|
index 5123e14fa6..3e6aeae1df 100644
|
|
--- a/crypto/s390xcap.c
|
|
+++ b/crypto/s390xcap.c
|
|
@@ -578,7 +578,8 @@ static int parse_env(struct OPENSSL_s390xcap_st *cap)
|
|
S390X_CAPBIT(S390X_VX)
|
|
| S390X_CAPBIT(S390X_VXD)
|
|
| S390X_CAPBIT(S390X_VXE)
|
|
- | S390X_CAPBIT(S390X_MSA8),
|
|
+ | S390X_CAPBIT(S390X_MSA8)
|
|
+ | S390X_CAPBIT(S390X_MSA9),
|
|
0ULL},
|
|
/*.kimd = */{S390X_CAPBIT(S390X_QUERY)
|
|
| S390X_CAPBIT(S390X_SHA_1)
|
|
@@ -642,11 +643,10 @@ static int parse_env(struct OPENSSL_s390xcap_st *cap)
|
|
| S390X_CAPBIT(S390X_AES_192)
|
|
| S390X_CAPBIT(S390X_AES_256),
|
|
0ULL},
|
|
- /*.pcc = */{S390X_CAPBIT(S390X_QUERY)
|
|
- | S390X_CAPBIT(S390X_SCALAR_MULTIPLY_P256)
|
|
+ /*.pcc = */{S390X_CAPBIT(S390X_QUERY),
|
|
+ S390X_CAPBIT(S390X_SCALAR_MULTIPLY_P256)
|
|
| S390X_CAPBIT(S390X_SCALAR_MULTIPLY_P384)
|
|
- | S390X_CAPBIT(S390X_SCALAR_MULTIPLY_P521),
|
|
- 0ULL},
|
|
+ | S390X_CAPBIT(S390X_SCALAR_MULTIPLY_P521)},
|
|
/*.kdsa = */{S390X_CAPBIT(S390X_QUERY)
|
|
| S390X_CAPBIT(S390X_ECDSA_VERIFY_P256)
|
|
| S390X_CAPBIT(S390X_ECDSA_VERIFY_P384)
|
|
--
|
|
2.24.0
|
|
|