diff options
| author | Pete Bentley <prb@google.com> | 2020-10-12 11:13:54 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-10-12 11:13:54 +0000 |
| commit | 911f7b1044fbbc6fe21e9d7d2d43e415f790287e (patch) | |
| tree | 4a01a662a3dd27b314a3aad3e75da15e37eb7d96 | |
| parent | d03710d520f4a3c34a4d0c90e3c3350bc637cbbd (diff) | |
| parent | a9eef60ccd223ec5ad82998f40803ee3d3acb746 (diff) | |
| download | ms-tpm-20-ref-911f7b1044fbbc6fe21e9d7d2d43e415f790287e.tar.gz | |
Revert "Explicitly disable SM3 hash and SM4 cipher." am: 0b9a27019b am: 7783f442ac am: a9eef60ccd
Original change: https://android-review.googlesource.com/c/platform/external/ms-tpm-20-ref/+/1456715
Change-Id: I88012c71be920acec4b6850ed1746068daf91fe7
| -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", |