diff options
| author | Patrick Steuer <patrick.steuer@de.ibm.com> | 2019-06-28 22:08:16 +0200 |
|---|---|---|
| committer | Patrick Steuer <patrick.steuer@de.ibm.com> | 2019-07-02 17:33:29 +0200 |
| commit | f690ef151c0c3becc234daebf0418e04ff80580e (patch) | |
| tree | d1e7f424e3a26e11236133aea4adb3c86fad70f8 /providers | |
| parent | 6592ab81d21fc01e05a01cd5b96c84b069bf8acf (diff) | |
| download | openssl-f690ef151c0c3becc234daebf0418e04ff80580e.zip openssl-f690ef151c0c3becc234daebf0418e04ff80580e.tar.gz openssl-f690ef151c0c3becc234daebf0418e04ff80580e.tar.bz2 | |
s390x assembly pack: fix various aes modes performance regression
which was introduced with 64adf9aac7.
Signed-off-by: Patrick Steuer <patrick.steuer@de.ibm.com>
Reviewed-by: Richard Levitte <levitte@openssl.org>
Reviewed-by: Shane Lontis <shane.lontis@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/9271)
Diffstat (limited to 'providers')
| -rw-r--r-- | providers/common/ciphers/aes_basic.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/providers/common/ciphers/aes_basic.c b/providers/common/ciphers/aes_basic.c index 0f64296..619386c 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; \ |