tree cd5a2cceeefbd07e34bf4048d8c32479e3cd3bdc
parent 911f7b1044fbbc6fe21e9d7d2d43e415f790287e
parent c2b737b8972b21f121d9f3fa8e854b07d5677613
author Pete Bentley <prb@google.com> 1602518087 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1602518087 +0000

Revert "Revert "Explicitly disable SM3 hash and SM4 cipher."" am: 267976c7ef am: c6d6a7d3a3 am: c2b737b897

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

Change-Id: I195ce1281d76ced96725ee7e070da8f8c7028cec