diff options
| author | Patrick Steuer <patrick.steuer@de.ibm.com> | 2019-09-24 23:20:00 +0200 |
|---|---|---|
| committer | Patrick Steuer <patrick.steuer@de.ibm.com> | 2019-09-25 15:53:53 +0200 |
| commit | ac037dc874a721ca81a33b4314e26cef4a7e8d48 (patch) | |
| tree | c28c6847552a0723ba30ef1bb336b97e7245c472 /crypto/s390xcap.c | |
| parent | s390x assembly pack: fix msa3 stfle bit detection (diff) | |
| download | openssl-ac037dc874a721ca81a33b4314e26cef4a7e8d48.tar.xz openssl-ac037dc874a721ca81a33b4314e26cef4a7e8d48.zip | |
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)
Diffstat (limited to '')
| -rw-r--r-- | crypto/s390xcap.c | 10 |
1 files 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) |