aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPete Bentley <prb@google.com>2020-09-30 02:37:50 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-09-30 02:37:50 +0000
commit117744abe5fa867be1eb7b1aaa267cae5afc4798 (patch)
treecd5a2cceeefbd07e34bf4048d8c32479e3cd3bdc
parent307d53ed1f67bfe67ed8f61fe9dc9b4edf46c3a6 (diff)
parenta5568dd02cce22df602ec1d5d363e8f4458e1f1e (diff)
downloadms-tpm-20-ref-117744abe5fa867be1eb7b1aaa267cae5afc4798.tar.gz
Explicitly disable SM3 hash and SM4 cipher. am: 4c66023a25 am: 441ff76781 am: 974a8b5922 am: de1d978900 am: a5568dd02c
Original change: https://android-review.googlesource.com/c/platform/external/ms-tpm-20-ref/+/1441338 Change-Id: Ia418107585bf8d62db9c8cc99a74c0b5bf9a425d
-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",