aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPete Bentley <prb@google.com>2020-10-12 12:39:14 +0000
committerPete Bentley <prb@google.com>2020-10-12 12:39:14 +0000
commit267976c7ef3a1d15c2bf560526be795d1a2725e7 (patch)
treecd5a2cceeefbd07e34bf4048d8c32479e3cd3bdc
parent0b9a27019b348b53b4ee74f5072a7121ab021e4e (diff)
downloadms-tpm-20-ref-267976c7ef3a1d15c2bf560526be795d1a2725e7.tar.gz
Revert "Revert "Explicitly disable SM3 hash and SM4 cipher.""
This reverts commit 0b9a27019b348b53b4ee74f5072a7121ab021e4e. Reason for revert: Breaks tests in postsubmit: b/170610462 Change-Id: Ia4eb309d9d35e0ff36171657a728fae6b76a11f3
-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",