From: Patrick Steuer Date: Tue, 24 Sep 2019 21:20:00 +0000 (+0200) Subject: s390x assembly pack: fix OPENSSL_s390xcap z15 cpu mask X-Git-Tag: openssl-3.0.0-alpha1~1282 X-Git-Url: https://git.openssl.org/?p=openssl.git;a=commitdiff_plain;h=ac037dc874a721ca81a33b4314e26cef4a7e8d48 s390x assembly pack: fix OPENSSL_s390xcap z15 cpu mask Signed-off-by: Patrick Steuer Reviewed-by: Richard Levitte (Merged from https://github.com/openssl/openssl/pull/10004) --- 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)