From 8eb399fb25a6ef68b2a9e8d34b242b9767c46abe Mon Sep 17 00:00:00 2001 From: Patrick Steuer Date: Wed, 28 Mar 2018 13:23:56 +0100 Subject: [PATCH] crypto/e_aes.c: use S390X_AES_FC macro ... to compute s390x aes function code from keylength. Signed-off-by: Patrick Steuer Reviewed-by: Richard Levitte Reviewed-by: Andy Polyakov Reviewed-by: Rich Salz (Merged from https://github.com/openssl/openssl/pull/5250) --- crypto/evp/e_aes.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/crypto/evp/e_aes.c b/crypto/evp/e_aes.c index 6f9cb6d2b4..a914a6e817 100644 --- a/crypto/evp/e_aes.c +++ b/crypto/evp/e_aes.c @@ -1734,8 +1734,7 @@ static int s390x_aes_gcm_init_key(EVP_CIPHER_CTX *ctx, keylen = EVP_CIPHER_CTX_key_length(ctx); memcpy(&gctx->kma.param.k, key, keylen); - /* Convert key size to function code. */ - gctx->fc = S390X_AES_128 + (((keylen << 3) - 128) >> 6); + gctx->fc = S390X_AES_FC(keylen); if (!enc) gctx->fc |= S390X_DECRYPT; @@ -2145,8 +2144,7 @@ static int s390x_aes_ccm_init_key(EVP_CIPHER_CTX *ctx, if (key != NULL) { keylen = EVP_CIPHER_CTX_key_length(ctx); - /* Convert key size to function code. */ - cctx->aes.ccm.fc = S390X_AES_128 + (((keylen << 3) - 128) >> 6); + cctx->aes.ccm.fc = S390X_AES_FC(keylen); memcpy(cctx->aes.ccm.kmac_param.k, key, keylen); /* Store encoded m and l. */