Commit 8eb399fb authored by Patrick Steuer's avatar Patrick Steuer Committed by Andy Polyakov
Browse files

crypto/e_aes.c: use S390X_AES_FC macro 



... to compute s390x aes function code from keylength.

Signed-off-by: default avatarPatrick Steuer <patrick.steuer@de.ibm.com>

Reviewed-by: default avatarRichard Levitte <levitte@openssl.org>
Reviewed-by: default avatarAndy Polyakov <appro@openssl.org>
Reviewed-by: default avatarRich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/5250)
parent 25868993

crypto/evp/e_aes.c

+2 −4
Original line number Diff line number Diff line
@@ -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. */