diff --git a/services/core/java/com/android/server/locksettings/SyntheticPasswordManager.java b/services/core/java/com/android/server/locksettings/SyntheticPasswordManager.java index d32c299074a96..0e195bcc98e06 100644 --- a/services/core/java/com/android/server/locksettings/SyntheticPasswordManager.java +++ b/services/core/java/com/android/server/locksettings/SyntheticPasswordManager.java @@ -29,6 +29,7 @@ import android.hardware.weaver.V1_0.WeaverStatus; import android.os.RemoteException; import android.os.UserManager; import android.security.GateKeeper; +import android.security.Scrypt; import android.service.gatekeeper.GateKeeperResponse; import android.service.gatekeeper.IGateKeeperService; import android.util.ArrayMap; @@ -1173,11 +1174,10 @@ public class SyntheticPasswordManager { } protected byte[] scrypt(String password, byte[] salt, int N, int r, int p, int outLen) { - return nativeScrypt(password.getBytes(), salt, N, r, p, outLen); + return new Scrypt().scrypt(password.getBytes(), salt, N, r, p, outLen); } native long nativeSidFromPasswordHandle(byte[] handle); - native byte[] nativeScrypt(byte[] password, byte[] salt, int N, int r, int p, int outLen); protected static ArrayList toByteArrayList(byte[] data) { ArrayList result = new ArrayList(data.length); diff --git a/services/core/jni/Android.bp b/services/core/jni/Android.bp index b85489a92464a..5ffcda614770c 100644 --- a/services/core/jni/Android.bp +++ b/services/core/jni/Android.bp @@ -31,7 +31,6 @@ cc_library_static { "com_android_server_input_InputManagerService.cpp", "com_android_server_lights_LightsService.cpp", "com_android_server_location_GnssLocationProvider.cpp", - "com_android_server_locksettings_SyntheticPasswordManager.cpp", "com_android_server_net_NetworkStatsService.cpp", "com_android_server_power_PowerManagerService.cpp", "com_android_server_security_VerityUtils.cpp", @@ -126,7 +125,6 @@ cc_defaults { static_libs: [ "android.hardware.broadcastradio@common-utils-1x-lib", - "libscrypt_static", ], product_variables: { diff --git a/services/core/jni/com_android_server_locksettings_SyntheticPasswordManager.cpp b/services/core/jni/com_android_server_locksettings_SyntheticPasswordManager.cpp deleted file mode 100644 index bc13fdec6cbcf..0000000000000 --- a/services/core/jni/com_android_server_locksettings_SyntheticPasswordManager.cpp +++ /dev/null @@ -1,90 +0,0 @@ -/* - * Copyright (C) 2016 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#define LOG_TAG "SyntheticPasswordManager" - -#include -#include "jni.h" - -#include -#include -#include -#include -#include -#include - - -extern "C" { -#include "crypto_scrypt.h" -} - -namespace android { - -static jlong android_server_SyntheticPasswordManager_nativeSidFromPasswordHandle(JNIEnv* env, jobject, jbyteArray handleArray) { - - jbyte* data = (jbyte*)env->GetPrimitiveArrayCritical(handleArray, NULL); - - if (data != NULL) { - const gatekeeper::password_handle_t *handle = - reinterpret_cast(data); - jlong sid = handle->user_id; - env->ReleasePrimitiveArrayCritical(handleArray, data, JNI_ABORT); - return sid; - } else { - return 0; - } -} - -static jbyteArray android_server_SyntheticPasswordManager_nativeScrypt(JNIEnv* env, jobject, jbyteArray password, jbyteArray salt, jint N, jint r, jint p, jint outLen) { - if (!password || !salt) { - return NULL; - } - - int passwordLen = env->GetArrayLength(password); - int saltLen = env->GetArrayLength(salt); - jbyteArray ret = env->NewByteArray(outLen); - - jbyte* passwordPtr = (jbyte*)env->GetByteArrayElements(password, NULL); - jbyte* saltPtr = (jbyte*)env->GetByteArrayElements(salt, NULL); - jbyte* retPtr = (jbyte*)env->GetByteArrayElements(ret, NULL); - - int rc = crypto_scrypt((const uint8_t *)passwordPtr, passwordLen, - (const uint8_t *)saltPtr, saltLen, N, r, p, (uint8_t *)retPtr, - outLen); - env->ReleaseByteArrayElements(password, passwordPtr, JNI_ABORT); - env->ReleaseByteArrayElements(salt, saltPtr, JNI_ABORT); - env->ReleaseByteArrayElements(ret, retPtr, 0); - - if (!rc) { - return ret; - } else { - SLOGE("scrypt failed"); - return NULL; - } -} - -static const JNINativeMethod sMethods[] = { - /* name, signature, funcPtr */ - {"nativeSidFromPasswordHandle", "([B)J", (void*)android_server_SyntheticPasswordManager_nativeSidFromPasswordHandle}, - {"nativeScrypt", "([B[BIIII)[B", (void*)android_server_SyntheticPasswordManager_nativeScrypt}, -}; - -int register_android_server_SyntheticPasswordManager(JNIEnv* env) { - return jniRegisterNativeMethods(env, "com/android/server/locksettings/SyntheticPasswordManager", - sMethods, NELEM(sMethods)); -} - -} /* namespace android */ diff --git a/services/core/jni/onload.cpp b/services/core/jni/onload.cpp index 918f57e2945e0..55cd852af5e95 100644 --- a/services/core/jni/onload.cpp +++ b/services/core/jni/onload.cpp @@ -50,7 +50,6 @@ int register_android_server_tv_TvInputHal(JNIEnv* env); int register_android_server_PersistentDataBlockService(JNIEnv* env); int register_android_server_Watchdog(JNIEnv* env); int register_android_server_HardwarePropertiesManagerService(JNIEnv* env); -int register_android_server_SyntheticPasswordManager(JNIEnv* env); int register_android_server_GraphicsStatsService(JNIEnv* env); int register_android_hardware_display_DisplayViewport(JNIEnv* env); int register_android_server_net_NetworkStatsService(JNIEnv* env); @@ -98,7 +97,6 @@ extern "C" jint JNI_OnLoad(JavaVM* vm, void* /* reserved */) register_android_server_PersistentDataBlockService(env); register_android_server_HardwarePropertiesManagerService(env); register_android_server_storage_AppFuse(env); - register_android_server_SyntheticPasswordManager(env); register_android_server_GraphicsStatsService(env); register_android_hardware_display_DisplayViewport(env); register_android_server_net_NetworkStatsService(env);