crypto/mvsam: fix AES-GCM session parameters
authorDana Vardi <danat@marvell.com>
Thu, 1 Jul 2021 06:58:12 +0000 (09:58 +0300)
committerAkhil Goyal <gakhil@marvell.com>
Wed, 7 Jul 2021 19:28:39 +0000 (21:28 +0200)
For AEAD session and AES-GCM mode, IV offset will
set to include the Nonce.
In addition, the following operations order will define:
first encryption and then authentication.

Fixes: 8a61c83af2fa ("crypto/mrvl: add mrvl crypto driver")
Cc: stable@dpdk.org
Signed-off-by: Dana Vardi <danat@marvell.com>
Reviewed-by: Liron Himi <lironh@marvell.com>
Tested-by: Liron Himi <lironh@marvell.com>
drivers/crypto/mvsam/rte_mrvl_pmd.c

index b2cfa71..ba5cb28 100644 (file)
@@ -360,6 +360,14 @@ mrvl_crypto_set_aead_session_parameters(struct mrvl_crypto_session *sess,
        sess->sam_sess_params.cipher_mode =
                aead_map[aead_xform->aead.algo].cipher_mode;
 
+       if (sess->sam_sess_params.cipher_mode == SAM_CIPHER_GCM) {
+               /* IV must include nonce for all counter modes */
+               sess->cipher_iv_offset = aead_xform->cipher.iv.offset;
+
+               /* Set order of authentication then encryption to 0 in GCM */
+               sess->sam_sess_params.u.basic.auth_then_encrypt = 0;
+       }
+
        /* Assume IV will be passed together with data. */
        sess->sam_sess_params.cipher_iv = NULL;