skylab/MasterPassword
2
0
Fork 0
Code Releases Activity

Android support for new native masterpassword-core.

Browse Source
This commit is contained in:
Maarten Billemont
2018-06-17 01:11:16 -04:00
parent f9289a3e9e
commit 1cbb584011
5 changed files with 37 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
platform-independent/c/core/src/mpw-jni.c
View File

@@ -6,6 +6,14 @@
// TODO: We may need to zero the jbytes safely.
JNIEXPORT jint JNI_OnLoad(JavaVM* vm, void* reserved) {
JNIEnv* env;
if (vm->GetEnv(&env, JNI_VERSION_1_6) != JNI_OK)
return -1;
return JNI_VERSION_1_6;
}
/* native int _masterKey(final String fullName, final byte[] masterPassword, final Version version) */
JNIEXPORT jbyteArray JNICALL Java_com_lyndir_masterpassword_impl_MPAlgorithmV0__1masterKey(JNIEnv *env, jobject obj,
jstring fullName, jbyteArray masterPassword, jint algorithmVersion) {

2
platform-independent/java/algorithm/build.gradle
View File

@@ -16,7 +16,7 @@ dependencies {
api group: 'com.google.code.findbugs', name: 'jsr305', version: '3.0.2'
api group: 'com.google.code.findbugs', name: 'findbugs-annotations', version: '3.0.1'
lib project( path: ':masterpassword-core', configuration: 'default' )
//lib project( path: ':masterpassword-core', configuration: 'default' )
}
processResources {