Skip to content

Commit 872943e

Browse files
nkaithakadankmonendra
authored andcommitted
octeon: fix invalid mac length in chacha poly
This patch fixes invalid mac length to resolve crash in Chacha Poly. Type: fix JIRA: https://essjira.marvell.com/browse/IPBUSW-62078 Signed-off-by: Nithinsen Kaithakadan <[email protected]> Change-Id: Ia940a721b5cb47f7b5fe68adbea78adaaa0f54f0 Reviewed-on: https://sj1git1.cavium.com/c/IP/SW/toolkits/vpp/+/147957 Reviewed-by: Monendra Singh Kushwaha <[email protected]> Tested-by: sa_ip-toolkits-Jenkins <[email protected]> (cherry picked from commit 2a43de5e1260df3809aa25a0d02fefc95945b5c6) Reviewed-on: https://sj1git1.cavium.com/c/IP/SW/toolkits/vpp/+/147963 Tested-by: Monendra Singh Kushwaha <[email protected]>
1 parent 8eac5da commit 872943e

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

src/plugins/dev_octeon/crypto.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1362,7 +1362,7 @@ oct_crypto_aead_session_update (vlib_main_t *vm, oct_crypto_sess_t *sess,
13621362
vnet_crypto_key_t *key = vnet_crypto_get_key (key_index);
13631363
roc_se_cipher_type enc_type = 0;
13641364
roc_se_auth_type auth_type = 0;
1365-
u32 digest_len = ~0;
1365+
u32 digest_len = 16;
13661366
i32 rv = 0;
13671367

13681368
switch (key->async_alg)
@@ -1374,9 +1374,6 @@ oct_crypto_aead_session_update (vlib_main_t *vm, oct_crypto_sess_t *sess,
13741374
sess->aes_gcm = 1;
13751375
sess->iv_offset = 0;
13761376
sess->iv_length = 16;
1377-
sess->cpt_ctx.mac_len = 16;
1378-
sess->cpt_op = type;
1379-
digest_len = 16;
13801377
break;
13811378
case VNET_CRYPTO_ALG_CHACHA20_POLY1305:
13821379
enc_type = ROC_SE_CHACHA20;
@@ -1389,6 +1386,9 @@ oct_crypto_aead_session_update (vlib_main_t *vm, oct_crypto_sess_t *sess,
13891386
return -1;
13901387
}
13911388

1389+
sess->cpt_ctx.mac_len = digest_len;
1390+
sess->cpt_op = type;
1391+
13921392
rv = roc_se_ciph_key_set (&sess->cpt_ctx, enc_type, key->data,
13931393
vec_len (key->data));
13941394
if (rv)

0 commit comments

Comments
 (0)