Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Check FIPS_mode() rather than explicitly calling BORINGSSL_self_test."

Browse Source
This commit is contained in:
Tobias Thierer
2019-09-13 16:56:06 +00:00
committed by Gerrit Code Review
parent cbc3d5d0ea 13032d242b
commit 414d53442e
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
services/core/jni/com_android_server_devicepolicy_CryptoTestHelper.cpp
View File

@@ -22,7 +22,7 @@
namespace { namespace {
static jint runSelfTest(JNIEnv* env, jobject /* clazz */) { static jint runSelfTest(JNIEnv* env, jobject /* clazz */) {
return BORINGSSL_self_test(); return FIPS_mode();
} }
static const JNINativeMethod methods[] = { 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)); env, "com/android/server/devicepolicy/CryptoTestHelper", methods, NELEM(methods));
} }
} // namespace android } // namespace android