aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPete Bentley <prb@google.com>2020-09-30 02:17:24 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-09-30 02:17:24 +0000
commita5568dd02cce22df602ec1d5d363e8f4458e1f1e (patch)
treecd5a2cceeefbd07e34bf4048d8c32479e3cd3bdc
parentf14061de3e0d2a9d46e5a78f7f5a8a7b5a517f81 (diff)
parentde1d978900042816aeccee9bf70271e9d8f4f365 (diff)
downloadms-tpm-20-ref-a5568dd02cce22df602ec1d5d363e8f4458e1f1e.tar.gz
Explicitly disable SM3 hash and SM4 cipher. am: 4c66023a25 am: 441ff76781 am: 974a8b5922 am: de1d978900
Original change: https://android-review.googlesource.com/c/platform/external/ms-tpm-20-ref/+/1441338 Change-Id: Ie313a85ea0930f36db72d096ef5edf328ce5ed5e
-rw-r--r--Android.bp5
1 files changed, 5 insertions, 0 deletions
diff --git a/Android.bp b/Android.bp
index caf246f..e28d37b 100644
--- a/Android.bp
+++ b/Android.bp
@@ -32,6 +32,11 @@ cc_defaults {
"-DMAX_SYM_DATA=256",
"-DDEBUG=YES",
"-DALG_CAMELLIA=ALG_NO",
+ // BoringSSL does not support SM3 or SM4
+ // TODO(prb): remove once https://boringssl-review.googlesource.com/c/boringssl/+/43104
+ // lands in AOSP.
+ "-DOPENSSL_NO_SM3",
+ "-DOPENSSL_NO_SM4",
"-Wno-logical-op-parentheses",
"-Wno-empty-body",
"-Wno-missing-field-initializers",