Commit 13032d24 authored Aug 22, 2019 by Tobias Thierer

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

parent 1566e186

services/core/jni/com_android_server_devicepolicy_CryptoTestHelper.cpp

+2 −2

Original line number	Diff line number	Diff line
		@@ -22,7 +22,7 @@
		namespace {

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

		static const JNINativeMethod methods[] = {