From 60af02bab708fe052279ba3b3a9bd31702ba60df Mon Sep 17 00:00:00 2001 From: Mikhail Krinkin Date: Wed, 8 Jan 2025 01:05:35 +0000 Subject: [PATCH] Bump up the version of ippcp Signed-off-by: Mikhail Krinkin Signed-off-by: Mikhail Krinkin --- bazel/foreign_cc/ipp-crypto-bn2lebinpad.patch | 17 +++++++++++++---- bazel/repository_locations.bzl | 10 +++++----- .../cryptomb/private_key_providers/source/BUILD | 3 +-- 3 files changed, 19 insertions(+), 11 deletions(-) diff --git a/bazel/foreign_cc/ipp-crypto-bn2lebinpad.patch b/bazel/foreign_cc/ipp-crypto-bn2lebinpad.patch index 22d003fcec7c..185fc19ee0e1 100644 --- a/bazel/foreign_cc/ipp-crypto-bn2lebinpad.patch +++ b/bazel/foreign_cc/ipp-crypto-bn2lebinpad.patch @@ -1,8 +1,8 @@ diff --git a/sources/ippcp/crypto_mb/src/common/ifma_cvt52.c b/sources/ippcp/crypto_mb/src/common/ifma_cvt52.c -index e6db178c..0a1ecc49 100644 +index e8ed7f99..bf32454b 100644 --- a/sources/ippcp/crypto_mb/src/common/ifma_cvt52.c +++ b/sources/ippcp/crypto_mb/src/common/ifma_cvt52.c -@@ -16,9 +16,14 @@ +@@ -16,6 +16,7 @@ #include #include @@ -10,10 +10,19 @@ index e6db178c..0a1ecc49 100644 #include +@@ -26,6 +27,15 @@ + + #define MIN(a, b) ( ((a) < (b)) ? a : b ) + ++#pragma GCC diagnostic push ++#pragma GCC diagnostic ignored "-Wunused-function" ++ +static int BN_bn2lebinpad(const BIGNUM *a, unsigned char *to, int tolen) { + return BN_bn2le_padded(to, tolen, a); +} + ++#pragma GCC diagnostic pop ++ + #if (_MBX >= _MBX_K1) + #if defined(_MSC_VER) && (_MSC_VER < 1920) - // Disable optimization for VS2017 due to AVX512 masking bug - #define DISABLE_OPTIMIZATION __pragma(optimize( "", off )) diff --git a/bazel/repository_locations.bzl b/bazel/repository_locations.bzl index 4b9164f030ae..a22e3b07290a 100644 --- a/bazel/repository_locations.bzl +++ b/bazel/repository_locations.bzl @@ -461,11 +461,11 @@ REPOSITORY_LOCATIONS_SPEC = dict( project_name = "libipp-crypto", project_desc = "Intel® Integrated Performance Primitives Cryptography", project_url = "https://github.com/intel/cryptography-primitives", - version = "2021.11.1", - sha256 = "76779724378fb3ec8b59047be02f6ca609c1ee70372b0205d937d451987bdb6c", - strip_prefix = "cryptography-primitives-ippcp_{version}", - urls = ["https://github.com/intel/cryptography-primitives/archive/ippcp_{version}.tar.gz"], - release_date = "2024-02-28", + version = "1.0.1", + sha256 = "8cf31ecb47c705603d6c41401ef92d4f104bbf8b510df90cce3d41b35c13b61c", + strip_prefix = "cryptography-primitives-{version}", + urls = ["https://github.com/intel/cryptography-primitives/archive/refs/tags/v{version}.tar.gz"], + release_date = "2024-12-11", use_category = ["dataplane_ext"], extensions = ["envoy.tls.key_providers.cryptomb"], cpe = "cpe:2.3:a:intel:cryptography_for_intel_integrated_performance_primitives:*", diff --git a/contrib/cryptomb/private_key_providers/source/BUILD b/contrib/cryptomb/private_key_providers/source/BUILD index 2daacaa61e9c..2b4fa81f5922 100644 --- a/contrib/cryptomb/private_key_providers/source/BUILD +++ b/contrib/cryptomb/private_key_providers/source/BUILD @@ -19,7 +19,7 @@ envoy_cmake( cache_entries = { "BORINGSSL": "on", "DYNAMIC_LIB": "off", - "MB_STANDALONE": "off", + "MB_STANDALONE": "on", }, defines = [ "OPENSSL_USE_STATIC_LIBS=TRUE", @@ -28,7 +28,6 @@ envoy_cmake( "//bazel:boringssl_fips": "@com_github_intel_ipp_crypto_crypto_mb_fips//:all", "//conditions:default": "@com_github_intel_ipp_crypto_crypto_mb//:all", }), - out_lib_dir = "lib/intel64", out_static_libs = ["libcrypto_mb.a"], tags = ["skip_on_windows"], target_compatible_with = envoy_contrib_linux_x86_64_constraints(),