github/xmrwallet
1
Fork 0
mirror of https://github.com/m2049r/xmrwallet synced 2025-05-06 04:29:41 +02:00
Code Releases Activity

deal with all broken variants ()

Browse Source 
* remove variant code for arm32

* deal with all broken variants
This commit is contained in:
m2049r 2018-05-25 23:44:37 +02:00 committed by GitHub
parent 22c5a543db
commit 271cd2d4a8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 31 additions and 23 deletions
app/src/main
cpp
monerujo.cppmonerujo.h
java/com/m2049r/xmrwallet/util
Helper.javaKeyStoreHelper.java

17
app/src/main/cpp/monerujo.cpp

@ -698,18 +698,23 @@ Java_com_m2049r_xmrwallet_model_Wallet_isSynchronized(JNIEnv *env, jobject insta
//void cn_slow_hash(const void *data, size_t length, char *hash); // from crypto/hash-ops.h //void cn_slow_hash(const void *data, size_t length, char *hash); // from crypto/hash-ops.h
JNIEXPORT jbyteArray JNICALL JNIEXPORT jbyteArray JNICALL
Java_com_m2049r_xmrwallet_util_KeyStoreHelper_slowHash(JNIEnv *env, jobject clazz, Java_com_m2049r_xmrwallet_util_KeyStoreHelper_slowHash(JNIEnv *env, jobject clazz,
jbyteArray data, jboolean broken) { jbyteArray data, jint brokenVariant) {
char hash[HASH_SIZE]; char hash[HASH_SIZE];
jsize size = env->GetArrayLength(data); jsize size = env->GetArrayLength(data);
if (broken && (size < 200 /*sizeof(union hash_state)*/)) { if ((brokenVariant > 0) && (size < 200 /*sizeof(union hash_state)*/)) {
return nullptr; return nullptr;
} }
jbyte *buffer = env->GetByteArrayElements(data, NULL); jbyte *buffer = env->GetByteArrayElements(data, NULL);
if (broken) { switch (brokenVariant) {
slow_hash_broken(buffer, hash); case 1:
} else { slow_hash_broken(buffer, hash, 1);
slow_hash(buffer, (size_t) size, hash); break;
case 2:
slow_hash_broken(buffer, hash, 0);
break;
default: // not broken
slow_hash(buffer, (size_t) size, hash);
} }
env->ReleaseByteArrayElements(data, buffer, JNI_ABORT); // do not update java byte[] env->ReleaseByteArrayElements(data, buffer, JNI_ABORT); // do not update java byte[]
jbyteArray result = env->NewByteArray(HASH_SIZE); jbyteArray result = env->NewByteArray(HASH_SIZE);

4
app/src/main/cpp/monerujo.h

@ -66,8 +66,8 @@ inline void slow_hash(const void *data, const size_t length, char *hash) {
cn_slow_hash(data, length, hash, 0 /* variant */, 0/*prehashed*/); cn_slow_hash(data, length, hash, 0 /* variant */, 0/*prehashed*/);
} }
inline void slow_hash_broken(const void *data, char *hash) { inline void slow_hash_broken(const void *data, char *hash, int variant) {
cn_slow_hash(data, 200 /*sizeof(union hash_state)*/, hash, 1 /* variant */, 1 /*prehashed*/); cn_slow_hash(data, 200 /*sizeof(union hash_state)*/, hash, variant, 1 /*prehashed*/);
} }
#ifdef __cplusplus #ifdef __cplusplus

14
app/src/main/java/com/m2049r/xmrwallet/util/Helper.java

@ -361,10 +361,16 @@ public class Helper {
return crazyPass; return crazyPass;
} }
// or maybe it is a broken CrAzYpass? // or maybe it is a broken CrAzYpass? (of which we have two variants)
String brokenCrazyPass = KeyStoreHelper.getBrokenCrazyPass(context, password); String brokenCrazyPass2 = KeyStoreHelper.getBrokenCrazyPass(context, password, 2);
if (WalletManager.getInstance().verifyWalletPassword(walletPath, brokenCrazyPass, true)) { if ((brokenCrazyPass2 != null)
return brokenCrazyPass; && WalletManager.getInstance().verifyWalletPassword(walletPath, brokenCrazyPass2, true)) {
return brokenCrazyPass2;
}
String brokenCrazyPass1 = KeyStoreHelper.getBrokenCrazyPass(context, password, 1);
if ((brokenCrazyPass1 != null)
&& WalletManager.getInstance().verifyWalletPassword(walletPath, brokenCrazyPass1, true)) {
return brokenCrazyPass1;
} }
return null; return null;

19
app/src/main/java/com/m2049r/xmrwallet/util/KeyStoreHelper.java

@ -61,17 +61,17 @@ public class KeyStoreHelper {
System.loadLibrary("monerujo"); System.loadLibrary("monerujo");
} }
public static native byte[] slowHash(byte[] data, boolean broken); public static native byte[] slowHash(byte[] data, int brokenVariant);
static final private String RSA_ALIAS = "MonerujoRSA"; static final private String RSA_ALIAS = "MonerujoRSA";
private static String getCrazyPass(Context context, String password, boolean broken) { private static String getCrazyPass(Context context, String password, int brokenVariant) {
byte[] data = password.getBytes(StandardCharsets.UTF_8); byte[] data = password.getBytes(StandardCharsets.UTF_8);
byte[] sig = null; byte[] sig = null;
try { try {
KeyStoreHelper.createKeys(context, RSA_ALIAS); KeyStoreHelper.createKeys(context, RSA_ALIAS);
sig = KeyStoreHelper.signData(RSA_ALIAS, data); sig = KeyStoreHelper.signData(RSA_ALIAS, data);
byte[] hash = slowHash(sig, broken); byte[] hash = slowHash(sig, brokenVariant);
if (hash == null) { if (hash == null) {
throw new IllegalStateException("Slow Hash is null!"); throw new IllegalStateException("Slow Hash is null!");
} }
@ -84,19 +84,16 @@ public class KeyStoreHelper {
} }
public static String getCrazyPass(Context context, String password) { public static String getCrazyPass(Context context, String password) {
return getCrazyPass(context, password, false); return getCrazyPass(context, password, 0);
} }
public static String getBrokenCrazyPass(Context context, String password) { public static String getBrokenCrazyPass(Context context, String password, int brokenVariant) {
// due to a link bug in the initial implementation, some crazypasses were built with // due to a link bug in the initial implementation, some crazypasses were built with
// prehash & variant == 1 // prehash & variant == 1
// since there are wallets out there, we need to keep this here // since there are wallets out there, we need to keep this here
// yes, it's a mess
// arm32 variant code is broken in monero-core if (isArm32() && (brokenVariant != 2)) return null;
// (raises "signal 7 (SIGBUS), code 1 (BUS_ADRALN)" in cn_slow_hash()) return getCrazyPass(context, password, brokenVariant);
if (isArm32()) return "";
return getCrazyPass(context, password, true);
} }
private static Boolean isArm32 = null; private static Boolean isArm32 = null;