diff options
| author | Pete Bentley <prb@google.com> | 2020-10-12 16:09:43 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-10-12 16:09:43 +0000 |
| commit | eb19e81825ec27c211e8218b234f507c08129a5c (patch) | |
| tree | cd5a2cceeefbd07e34bf4048d8c32479e3cd3bdc | |
| parent | 67b7d6127dbb8f287f84cc5b7a6f53a153308615 (diff) | |
| parent | ebd3f2090507491570a120056f6ec0601d215004 (diff) | |
| download | ms-tpm-20-ref-eb19e81825ec27c211e8218b234f507c08129a5c.tar.gz | |
Revert "Revert "Explicitly disable SM3 hash and SM4 cipher."" am: 267976c7ef am: c6d6a7d3a3 am: c2b737b897 am: ebd3f20905
Original change: https://android-review.googlesource.com/c/platform/external/ms-tpm-20-ref/+/1456718
Change-Id: I6c1e46ad63010250820ffcdb8c980b97bb19cbe5
| -rw-r--r-- | Android.bp | 5 |
1 files changed, 5 insertions, 0 deletions
@@ -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", |