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

Merge "Replace the native scrypt in SyntheticPasswordManager by android.security.Scrypt (try this again)"

Browse Source
This commit is contained in:
Bo Zhu
2018-12-07 19:59:41 +00:00
committed by Android (Google) Code Review
parent c02acadd9b f2c9934c37
commit 3c359caa68
3 changed files with 2 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
services/core/java/com/android/server/locksettings/SyntheticPasswordManager.java
View File

@@ -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<Byte> toByteArrayList(byte[] data) {
ArrayList<Byte> result = new ArrayList<Byte>(data.length);

1
services/core/jni/Android.bp
View File

@@ -126,7 +126,6 @@ cc_defaults {
static_libs: [
"android.hardware.broadcastradio@common-utils-1x-lib",
"libscrypt_static",
],
product_variables: {

33
services/core/jni/com_android_server_locksettings_SyntheticPasswordManager.cpp
View File

@@ -27,10 +27,6 @@
#include <gatekeeper/password_handle.h>
extern "C" {
#include "crypto_scrypt.h"
}
namespace android {
static jlong android_server_SyntheticPasswordManager_nativeSidFromPasswordHandle(JNIEnv* env, jobject, jbyteArray handleArray) {
@@ -48,38 +44,9 @@ static jlong android_server_SyntheticPasswordManager_nativeSidFromPasswordHandle
}
}
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) {