resolves issue 14 where account import fails after register followed …

…by login followed by change to password followed by login.
signalapp · Jul 21, 2014 · 3a9b0a1 · 3a9b0a1
1 parent 07b6978
commit 3a9b0a1
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/flock/src/main/java/org/anhonesteffort/flock/crypto/KeyHelper.java b/flock/src/main/java/org/anhonesteffort/flock/crypto/KeyHelper.java
@@ -129,7 +129,7 @@ public static void importSaltAndEncryptedKeyMaterial(Context  context,
     byte[] plaintextCipherKey   = Arrays.copyOfRange(plaintextKeyMaterial, 0, KeyUtil.CIPHER_KEY_LENGTH_BYTES);
     byte[] plaintextMacKey      = Arrays.copyOfRange(plaintextKeyMaterial,
                                                      KeyUtil.CIPHER_KEY_LENGTH_BYTES,
-                                                     plaintextCipherKey.length);
+                                                     KeyUtil.CIPHER_KEY_LENGTH_BYTES + KeyUtil.MAC_KEY_LENGTH_BYTES);
 
     KeyStore.saveEncryptedKeyMaterial(context, saltAndEncryptedKeyMaterial[1]);
     KeyStore.saveKeyMaterialSalt(     context, salt);