From: Nithinsen Kaithakadan <nkaithaka...@marvell.com>

This patch includes fix for setting correct salt value
for CTR algorithm.

Fixes: 532963b8070 ("crypto/cnxk: move IPsec SA creation to common")

Signed-off-by: Nithinsen Kaithakadan <nkaithaka...@marvell.com>
---
 drivers/common/cnxk/cnxk_security.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/drivers/common/cnxk/cnxk_security.c 
b/drivers/common/cnxk/cnxk_security.c
index 62ae7b9b2e..0e6777e6ca 100644
--- a/drivers/common/cnxk/cnxk_security.c
+++ b/drivers/common/cnxk/cnxk_security.c
@@ -965,6 +965,8 @@ on_fill_ipsec_common_sa(struct rte_security_ipsec_xform 
*ipsec,
                cipher_key_len = crypto_xform->aead.key.length;
        } else {
                if (cipher_xform) {
+                       if (cipher_xform->cipher.algo == 
RTE_CRYPTO_CIPHER_AES_CTR)
+                               memcpy(common_sa->iv.gcm.nonce, &ipsec->salt, 
4);
                        cipher_key = cipher_xform->cipher.key.data;
                        cipher_key_len = cipher_xform->cipher.key.length;
                }
@@ -1285,6 +1287,9 @@ ow_ipsec_sa_common_param_fill(union roc_ow_ipsec_sa_word2 
*w2, uint8_t *cipher_k
                                break;
                        case RTE_CRYPTO_CIPHER_AES_CTR:
                                w2->s.enc_type = ROC_IE_SA_ENC_AES_CTR;
+                               memcpy(salt_key, &ipsec_xfrm->salt, 4);
+                               tmp_salt = (uint32_t *)salt_key;
+                               *tmp_salt = rte_be_to_cpu_32(*tmp_salt);
                                break;
                        case RTE_CRYPTO_CIPHER_3DES_CBC:
                                w2->s.enc_type = ROC_IE_SA_ENC_3DES_CBC;
-- 
2.25.1

Reply via email to