aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPete Bentley <prb@google.com>2020-10-13 14:16:25 +0000
committerPete Bentley <prb@google.com>2020-10-13 14:17:33 +0000
commitb9411834e9d046eadde7eb5d2d874fc727f29449 (patch)
tree4a01a662a3dd27b314a3aad3e75da15e37eb7d96
parent4c66023a252a927c4ba4260cdfd09e036bcb3391 (diff)
downloadms-tpm-20-ref-b9411834e9d046eadde7eb5d2d874fc727f29449.tar.gz
Revert "Explicitly disable SM3 hash and SM4 cipher."
Second attempt. This reverts commit 4c66023a252a927c4ba4260cdfd09e036bcb3391. Reason for revert: Equivalent change is in https://r.android.com/1458438 Bug: 160351436 Change-Id: Ifc862f3cf90c8fcd5bb5b5ed2a8542de8bd2c69f
-rw-r--r--Android.bp5
1 files changed, 0 insertions, 5 deletions
diff --git a/Android.bp b/Android.bp
index e28d37b..caf246f 100644
--- a/Android.bp
+++ b/Android.bp
@@ -32,11 +32,6 @@ 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",