commit a9eef60ccd223ec5ad82998f40803ee3d3acb746
author Pete Bentley <prb@google.com> Mon Oct 12 11:04:26 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon Oct 12 11:04:26 2020 +0000
tree 4a01a662a3dd27b314a3aad3e75da15e37eb7d96
parent ee1cb1033a8432f3ce82f87cc3eb1907f0c091d0
parent 7783f442ac96675f244b3823c5f86ffc6e29d7ee

Revert "Explicitly disable SM3 hash and SM4 cipher." am: 0b9a27019b am: 7783f442ac

Original change: https://android-review.googlesource.com/c/platform/external/ms-tpm-20-ref/+/1456715

Change-Id: I52ccd35c19dfaa8833e580b3d50dd4952c34903e

Android.bp

diff --git a/Android.bp b/Android.bp
index e28d37b..caf246f 100644
--- a/Android.bp
+++ b/Android.bp
@@ -32,11 +32,6 @@
         "-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",