aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPete Bentley <prb@google.com>2020-09-30 01:17:17 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-09-30 01:17:17 +0000
commit974a8b59221cc4775d3647040ef1e01798dbc73d (patch)
treecd5a2cceeefbd07e34bf4048d8c32479e3cd3bdc
parentbb9dd18f366f8cc52e94a6e95ebfb7675e0e0597 (diff)
parent441ff76781a82d0bef1d14958e1b2ae34cefb921 (diff)
downloadms-tpm-20-ref-974a8b59221cc4775d3647040ef1e01798dbc73d.tar.gz
Explicitly disable SM3 hash and SM4 cipher. am: 4c66023a25 am: 441ff76781
Original change: https://android-review.googlesource.com/c/platform/external/ms-tpm-20-ref/+/1441338 Change-Id: I3d866c220f49142ef26c6c663080413bf5a32dc5
-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",