From: Damjan Marion <damarion@cisco.com>
Date: Tue, 23 Apr 2019 10:57:14 +0000 (+0200)
Subject: Bump to intel-ipsec-mb version 0.52
X-Git-Tag: v20.01-rc0~756
X-Git-Url: https://gerrit.fd.io/r/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F08%2F19108%2F3;p=vpp.git

Bump to intel-ipsec-mb version 0.52

Change-Id: Ifeaf93c98e4af92da9409fa5a2114b577e8c0937
Signed-off-by: Damjan Marion <damarion@cisco.com>
---

diff --git a/build/external/packages/ipsec-mb.mk b/build/external/packages/ipsec-mb.mk
index 8c564fbaea9..522ba0e9c79 100644
--- a/build/external/packages/ipsec-mb.mk
+++ b/build/external/packages/ipsec-mb.mk
@@ -11,10 +11,10 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-ipsec-mb_version             := 0.49
+ipsec-mb_version             := 0.52
 ipsec-mb_tarball             := v$(ipsec-mb_version).tar.gz
 ipsec-mb_tarball_md5sum_0.49 := 3a2bee86f25f6c8ed720da5b4b8d4297
-ipsec-mb_tarball_md5sum_0.50 := c847ed77ae34da551237349f1c9db1e9
+ipsec-mb_tarball_md5sum_0.52 := 11ecfa6db4dc0c4ca6e5c616c141ac46
 ipsec-mb_tarball_md5sum      := $(ipsec-mb_tarball_md5sum_$(ipsec-mb_version))
 ipsec-mb_tarball_strip_dirs  := 1
 ipsec-mb_depends             := nasm
@@ -25,18 +25,18 @@ define  ipsec-mb_config_cmds
 endef
 
 define  ipsec-mb_build_cmds
-	echo "BUILDING"
-	make -C $(ipsec-mb_src_dir) DEBUG=y NASM=$(ipsec-mb_install_dir)/bin/nasm 
+	@make -C $(ipsec-mb_src_dir) -j \
+	  SHARED=n \
+	  PREFIX=$(ipsec-mb_install_dir) \
+	  NASM=$(ipsec-mb_install_dir)/bin/nasm \
+	  EXTRA_CFLAGS=-g > $(ipsec-mb_build_log)
 endef
 
 define  ipsec-mb_install_cmds
 	@mkdir -p $(ipsec-mb_install_dir)/include
-	@make -C $(ipsec-mb_src_dir) -j \
-	  SHARED=n \
-	  EXTRA_CFLAGS=-fPIC \
-	  NASM=$(ipsec-mb_install_dir)/bin/nasm \
-	  PREFIX=$(ipsec-mb_install_dir) \
-	  install > $(ipsec-mb_install_log)
+	@mkdir -p $(ipsec-mb_install_dir)/lib
+	@cp $(ipsec-mb_src_dir)/intel-ipsec-mb.h $(ipsec-mb_install_dir)/include
+	@cp $(ipsec-mb_src_dir)/libIPSec_MB.a $(ipsec-mb_install_dir)/lib
 endef
 
 $(eval $(call package,ipsec-mb))
diff --git a/src/plugins/crypto_ipsecmb/ipsecmb.c b/src/plugins/crypto_ipsecmb/ipsecmb.c
index 9b3cf3b7afd..6d4d9136784 100644
--- a/src/plugins/crypto_ipsecmb/ipsecmb.c
+++ b/src/plugins/crypto_ipsecmb/ipsecmb.c
@@ -519,6 +519,7 @@ crypto_ipsecmb_init (vlib_main_t * vm)
   vlib_thread_main_t *tm = vlib_get_thread_main ();
   clib_error_t *error;
   u32 eidx;
+  u8 *name;
 
   if ((error = vlib_call_init_function (vm, vnet_crypto_init)))
     return error;
@@ -526,8 +527,9 @@ crypto_ipsecmb_init (vlib_main_t * vm)
   /*
    * A priority that is better than OpenSSL but worse than VPP natvie
    */
-  eidx = vnet_crypto_register_engine (vm, "ipsecmb", 80,
-				      "Intel IPSEC multi-buffer");
+  name = format (0, "Intel(R) Multi-Buffer Crypto for IPsec Library %s%c",
+		 IMB_VERSION_STR, 0);
+  eidx = vnet_crypto_register_engine (vm, "ipsecmb", 80, (char *) name);
 
   vec_validate (imbm->per_thread_data, tm->n_vlib_mains - 1);