aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPete Bentley <prb@google.com>2020-10-12 14:57:25 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-10-12 14:57:25 +0000
commitc6d6a7d3a3702aed1a17f7917655b8d5d20a4b1c (patch)
treecd5a2cceeefbd07e34bf4048d8c32479e3cd3bdc
parent7783f442ac96675f244b3823c5f86ffc6e29d7ee (diff)
parent267976c7ef3a1d15c2bf560526be795d1a2725e7 (diff)
downloadms-tpm-20-ref-c6d6a7d3a3702aed1a17f7917655b8d5d20a4b1c.tar.gz
Revert "Revert "Explicitly disable SM3 hash and SM4 cipher."" am: 267976c7ef
Original change: https://android-review.googlesource.com/c/platform/external/ms-tpm-20-ref/+/1456718 Change-Id: I13e89565c00d370c999cf4f83f1a0a38d0847cdd
-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",