Merge "Check FIPS_mode() rather than explicitly calling BORINGSSL_self_test." am: 414d53442e am: 80809d6d5a

am: 63522e8f02 Change-Id: I2e8bb7fd221c21d87527d2c11b19433bcacd808d
2019-09-13 10:46:05 -07:00
parent 4eff657ef2 63522e8f02
commit 1bf5329a63
1 changed files with 2 additions and 2 deletions
--- a/services/core/jni/com_android_server_devicepolicy_CryptoTestHelper.cpp
+++ b/services/core/jni/com_android_server_devicepolicy_CryptoTestHelper.cpp
@@ -22,7 +22,7 @@
 namespace {

 static jint runSelfTest(JNIEnv* env, jobject /* clazz */) {
-    return BORINGSSL_self_test();
+    return FIPS_mode();
 }

 static const JNINativeMethod methods[] = {
@@ -39,4 +39,4 @@ int register_android_server_devicepolicy_CryptoTestHelper(JNIEnv *env) {
            env, "com/android/server/devicepolicy/CryptoTestHelper", methods, NELEM(methods));
 }

-} // namespace android
+} // namespace android