From 13032d242bb1ae9374e34386001746af2f4c7549 Mon Sep 17 00:00:00 2001
From: Tobias Thierer <tobiast@google.com>
Date: Thu, 22 Aug 2019 21:55:15 +0100
Subject: [PATCH] Check FIPS_mode() rather than explicitly calling
 BORINGSSL_self_test.

After this CL topic, BORINGSSL_self_test runs automatically when
libcrypto is loaded. It is no longer possible or necessary to
start it manually. Instead, we check that we're running in FIPS_mode(),
which guarantees that the self test has already run.

Bug: 137267623
Bug: 139918106
Test: Treehugger
Change-Id: Ic3564218de4f01c37c51c139b1ad5a435a1fd6cd
---
 .../jni/com_android_server_devicepolicy_CryptoTestHelper.cpp  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/services/core/jni/com_android_server_devicepolicy_CryptoTestHelper.cpp b/services/core/jni/com_android_server_devicepolicy_CryptoTestHelper.cpp
index b53ea925e837e..2b1c83f773dab 100644
--- 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
\ No newline at end of file
+} // namespace android