From: Patrick Steuer Date: Fri, 28 Jun 2019 20:08:16 +0000 (+0200) Subject: s390x assembly pack: fix various aes modes performance regression X-Git-Tag: openssl-3.0.0-alpha1~1824 X-Git-Url: https://git.openssl.org/gitweb/?p=openssl.git;a=commitdiff_plain;h=f690ef151c0c3becc234daebf0418e04ff80580e;hp=6592ab81d21fc01e05a01cd5b96c84b069bf8acf;ds=sidebyside s390x assembly pack: fix various aes modes performance regression which was introduced with 64adf9aac7. Signed-off-by: Patrick Steuer Reviewed-by: Richard Levitte Reviewed-by: Shane Lontis (Merged from https://github.com/openssl/openssl/pull/9271) --- diff --git a/providers/common/ciphers/aes_basic.c b/providers/common/ciphers/aes_basic.c index 0f642966eb..619386ca5a 100644 --- a/providers/common/ciphers/aes_basic.c +++ b/providers/common/ciphers/aes_basic.c @@ -606,9 +606,9 @@ static const PROV_AES_CIPHER aes_##mode = { \ }; \ const PROV_AES_CIPHER *PROV_AES_CIPHER_##mode(size_t keylen) \ { \ - if ((keylen == 128 && S390X_aes_128_##mode##_CAPABLE) \ - || (keylen == 192 && S390X_aes_192_##mode##_CAPABLE) \ - || (keylen == 256 && S390X_aes_256_##mode##_CAPABLE)) \ + if ((keylen == 16 && S390X_aes_128_##mode##_CAPABLE) \ + || (keylen == 24 && S390X_aes_192_##mode##_CAPABLE) \ + || (keylen == 32 && S390X_aes_256_##mode##_CAPABLE)) \ return &s390x_aes_##mode; \ \ return &aes_##mode; \