From: Dmitry Vakhrushev <dmitry@netgate.com>
Date: Wed, 14 Aug 2019 04:12:33 +0000 (-0400)
Subject: ipsec: fix missed IPSEC_INTEG_ALG_MD5_96
X-Git-Tag: v20.05-rc0~998
X-Git-Url: https://gerrit.fd.io/r/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F84%2F21284%2F4;p=vpp.git

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
---

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.