[openssl] master update

[patrick.steuer at de.ibm.com]

The branch master has been updated
       via  f690ef151c0c3becc234daebf0418e04ff80580e (commit)
      from  6592ab81d21fc01e05a01cd5b96c84b069bf8acf (commit)


- Log -----------------------------------------------------------------
commit f690ef151c0c3becc234daebf0418e04ff80580e
Author: Patrick Steuer <patrick.steuer at de.ibm.com>
Date:   Fri Jun 28 22:08:16 2019 +0200

    s390x assembly pack: fix various aes modes performance regression
    
    which was introduced with 64adf9aac7.
    
    Signed-off-by: Patrick Steuer <patrick.steuer at de.ibm.com>
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    Reviewed-by: Shane Lontis <shane.lontis at oracle.com>
    (Merged from https://github.com/openssl/openssl/pull/9271)

-----------------------------------------------------------------------

Summary of changes:
 providers/common/ciphers/aes_basic.c | 6 +++---
 1 file 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; \