ligang/vpp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ipsec: fix missed IPSEC_INTEG_ALG_MD5_96

Browse Source 
This algorithm was missed in last improvements.

Type:fix

Signed-off-by: Dmitry Vakhrushev <dmitry@netgate.com>
Change-Id: Ib818cbdcdd1a6f298e8b0086dac4189cc201baa3
(cherry picked from commit 77cc14a2b2)
This commit is contained in:
Dmitry Vakhrushev
2019-08-14 00:12:33 -04:00
committed by Andrew Yourtchenko
parent 2dde5a4782
commit b197fd7b67
2 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/vnet/ipsec/ipsec.c
View File

@ -374,6 +374,11 @@ ipsec_init (vlib_main_t * vm)
vec_validate (im->integ_algs, IPSEC_INTEG_N_ALG - 1);
ipsec_main_integ_alg_t *i;
i = &im->integ_algs[IPSEC_INTEG_ALG_MD5_96];
i->op_id = VNET_CRYPTO_OP_MD5_HMAC;
i->alg = VNET_CRYPTO_ALG_HMAC_MD5;
i->icv_size = 12;
i = &im->integ_algs[IPSEC_INTEG_ALG_SHA1_96];
i->op_id = VNET_CRYPTO_OP_SHA1_HMAC;
i->alg = VNET_CRYPTO_ALG_HMAC_SHA1;

6
test/test_ipsec_esp.py
View File

@ -366,7 +366,7 @@ class TestIpsecEspAll(ConfigIpsecESP,
@parameterized.expand(["ia32", "ipsecmb", "openssl"])
def test_crypto_algs(self, engine):
"""AES-[CBC, GCM]-[128, 192, 256] 3DES-CBC w/ & w/o ESN"""
"""AES-[CBC, GCM]-[128, 192, 256] 3DES-CBC SHA1 MD5 w/ & w/o ESN"""
# foreach crypto algorithm
algos = [{'vpp-crypto': (VppEnum.vl_api_ipsec_crypto_alg_t.
@ -396,9 +396,9 @@ class TestIpsecEspAll(ConfigIpsecESP,
{'vpp-crypto': (VppEnum.vl_api_ipsec_crypto_alg_t.
IPSEC_API_CRYPTO_ALG_AES_CBC_128),
'vpp-integ': (VppEnum.vl_api_ipsec_integ_alg_t.
IPSEC_API_INTEG_ALG_SHA1_96),
IPSEC_API_INTEG_ALG_MD5_96),
'scapy-crypto': "AES-CBC",
'scapy-integ': "HMAC-SHA1-96",
'scapy-integ': "HMAC-MD5-96",
'salt': 0,
'key': "JPjyOWBeVEQiMe7h"},
{'vpp-crypto': (VppEnum.vl_api_ipsec_crypto_alg_t.