diff options
| author | Pete Bentley <prb@google.com> | 2020-10-15 09:38:02 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-10-15 09:38:02 +0000 |
| commit | 0627e82f3a119f99b4866363dcea656d9ffc6e38 (patch) | |
| tree | 4a01a662a3dd27b314a3aad3e75da15e37eb7d96 | |
| parent | c2b737b8972b21f121d9f3fa8e854b07d5677613 (diff) | |
| parent | 3a810d657c3565f78351aeaf0b4c8660ddc05cab (diff) | |
| download | ms-tpm-20-ref-0627e82f3a119f99b4866363dcea656d9ffc6e38.tar.gz | |
Merge "Revert "Explicitly disable SM3 hash and SM4 cipher."" am: 9912bfae0a am: 3a810d657c
Original change: https://android-review.googlesource.com/c/platform/external/ms-tpm-20-ref/+/1458478
Change-Id: Ib896afc0662a6f945d7002a033d5e1ee446a4de5
| -rw-r--r-- | Android.bp | 5 |
1 files changed, 0 insertions, 5 deletions
@@ -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", |