From 6f012671338965dd8f4afa88a1e3d25775b1a7a3 Mon Sep 17 00:00:00 2001 From: luvletter2333 Date: Thu, 23 Dec 2021 23:48:29 +0800 Subject: [PATCH] Update boringssl --- TMessagesProj/jni/boringssl | 2 +- TMessagesProj/jni/build_boringssl.sh | 2 +- TMessagesProj/jni/patches/boringssl/0001-add-aes-ige-mode.patch | 2 +- .../jni/patches/boringssl/0001-only-build-what-we-need.patch | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/TMessagesProj/jni/boringssl b/TMessagesProj/jni/boringssl index 04b3213d4..9bcc12d54 160000 --- a/TMessagesProj/jni/boringssl +++ b/TMessagesProj/jni/boringssl @@ -1 +1 @@ -Subproject commit 04b3213d43492b6c9e0434d8e2a4530a9938f958 +Subproject commit 9bcc12d540c3b844ba317f042c731d64142af725 diff --git a/TMessagesProj/jni/build_boringssl.sh b/TMessagesProj/jni/build_boringssl.sh index 94d9643cf..81ead408c 100755 --- a/TMessagesProj/jni/build_boringssl.sh +++ b/TMessagesProj/jni/build_boringssl.sh @@ -7,7 +7,7 @@ function build_one { cd ${CPU} echo "Configuring..." - cmake -DANDROID_NATIVE_API_LEVEL=${API} -DANDROID_ABI=${CPU} -DCMAKE_BUILD_TYPE=Release -DANDROID_NDK=${NDK} -DCMAKE_TOOLCHAIN_FILE=$NDK/build/cmake/android.toolchain.cmake -DANDROID_NATIVE_API_LEVEL=16 -GNinja -DCMAKE_MAKE_PROGRAM=${NINJA_PATH} ../.. + cmake -DANDROID_NATIVE_API_LEVEL=${API} -DANDROID_ABI=${CPU} -DCMAKE_BUILD_TYPE=Release -DANDROID_NDK=${NDK} -DCMAKE_TOOLCHAIN_FILE=$NDK/build/cmake/android.toolchain.cmake -GNinja -DCMAKE_MAKE_PROGRAM=${NINJA_PATH} ../.. echo "Building..." cmake --build . diff --git a/TMessagesProj/jni/patches/boringssl/0001-add-aes-ige-mode.patch b/TMessagesProj/jni/patches/boringssl/0001-add-aes-ige-mode.patch index 570872722..cf29c40a8 100644 --- a/TMessagesProj/jni/patches/boringssl/0001-add-aes-ige-mode.patch +++ b/TMessagesProj/jni/patches/boringssl/0001-add-aes-ige-mode.patch @@ -16,7 +16,7 @@ index 30823755..b349572c 100644 +++ b/crypto/fipsmodule/CMakeLists.txt @@ -198,6 +198,8 @@ else() bcm.c - is_fips.c + fips_shared_support.c + aes/aes_ige.c + diff --git a/TMessagesProj/jni/patches/boringssl/0001-only-build-what-we-need.patch b/TMessagesProj/jni/patches/boringssl/0001-only-build-what-we-need.patch index c22eba63d..b508c1ea4 100644 --- a/TMessagesProj/jni/patches/boringssl/0001-only-build-what-we-need.patch +++ b/TMessagesProj/jni/patches/boringssl/0001-only-build-what-we-need.patch @@ -143,6 +143,7 @@ index e940f7d5f..f5221d70d 100644 - cipher_extra/cipher_test.cc - cmac/cmac_test.cc - compiler_test.cc +- conf/conf_test.cc - constant_time_test.cc - cpu-arm-linux_test.cc - crypto_test.cc @@ -193,7 +194,6 @@ index e940f7d5f..f5221d70d 100644 - x509/x509_test.cc - x509/x509_time_test.cc - x509v3/tab_test.cc -- x509v3/v3name_test.cc - - $ - $