diff options
| author |   Dmitry Vakhrushev <dmitry@netgate.com> | 2019-08-14 00:12:33 -0400 |
|---|---|---|
| committer |   Andrew Yourtchenko <ayourtch@gmail.com> | 2019-09-19 18:18:28 +0000 |
| commit | b197fd7b67762bd1616f636a17eda1c7195adc02 (patch) | |
| tree | 0a42239928ca821d7cd879d087935a86dab59bb7 | |
| parent | 2dde5a47824a5c3949efa9a9e5354b65aa84d3c2 (diff) | |
ipsec: fix missed IPSEC_INTEG_ALG_MD5_96
This algorithm was missed in last improvements.
Type:fix
Signed-off-by: Dmitry Vakhrushev <dmitry@netgate.com>
Change-Id: Ib818cbdcdd1a6f298e8b0086dac4189cc201baa3
(cherry picked from commit 77cc14a2b29a65073539e6e3f4683a380875b3dc)
| -rw-r--r-- | src/vnet/ipsec/ipsec.c | 5 | ||||
| -rw-r--r-- | test/test_ipsec_esp.py | 6 |
2 files changed, 8 insertions, 3 deletions
diff --git a/src/vnet/ipsec/ipsec.c b/src/vnet/ipsec/ipsec.c index 21e1d5ec43f..388179976c7 100644 --- a/src/vnet/ipsec/ipsec.c +++ b/src/vnet/ipsec/ipsec.c @@ -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; diff --git a/test/test_ipsec_esp.py b/test/test_ipsec_esp.py index b13d6926e21..26f83f16b92 100644 --- a/test/test_ipsec_esp.py +++ b/test/test_ipsec_esp.py @@ -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. |