Qortal/altcoinj
1
0
Fork 1
mirror of https://github.com/Qortal/altcoinj.git synced 2025-07-30 19:41:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

KeyCrypterScryptTest: Fix spurious test failure in testKeyCrypterWrongPassword().

Browse Source
This commit is contained in:
Andreas Schildbach
2019-04-09 12:31:57 +02:00
parent b567260189
commit 55612cd1dc
1 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
core/src/test/java/org/bitcoinj/crypto/KeyCrypterScryptTest.java
View File

@@ -44,6 +44,7 @@ public class KeyCrypterScryptTest {
private static final CharSequence PASSWORD2 = "0123456789"; private static final CharSequence PASSWORD2 = "0123456789";
private static final CharSequence WRONG_PASSWORD = "thisIsTheWrongPassword"; private static final CharSequence WRONG_PASSWORD = "thisIsTheWrongPassword";
private static final CharSequence WRONG_PASSWORD2 = "anotherWrongPassword";
private ScryptParameters scryptParameters; private ScryptParameters scryptParameters;
@@ -106,15 +107,21 @@ public class KeyCrypterScryptTest {
builder.append(i).append(" The quick brown fox"); builder.append(i).append(" The quick brown fox");
} }
EncryptedData data = keyCrypter.encrypt(builder.toString().getBytes(), keyCrypter.deriveKey(PASSWORD2)); byte[] plainText = builder.toString().getBytes();
EncryptedData data = keyCrypter.encrypt(plainText, keyCrypter.deriveKey(PASSWORD2));
assertNotNull(data); assertNotNull(data);
try { try {
keyCrypter.decrypt(data, keyCrypter.deriveKey(WRONG_PASSWORD)); // This sometimes doesn't throw due to relying on padding...
// TODO: This test sometimes fails due to relying on padding. byte[] cipherText = keyCrypter.decrypt(data, keyCrypter.deriveKey(WRONG_PASSWORD));
// ...so we also check for length, because that's the 2nd level test we're doing e.g. in ECKey/DeterministicKey...
assertNotEquals(plainText.length, cipherText.length);
// ...and then try with another wrong password again.
keyCrypter.decrypt(data, keyCrypter.deriveKey(WRONG_PASSWORD2));
// Note: it can still fail, but it should be extremely rare.
fail("Decrypt with wrong password did not throw exception"); fail("Decrypt with wrong password did not throw exception");
} catch (KeyCrypterException ede) { } catch (KeyCrypterException.InvalidCipherText x) {
assertTrue(ede.getMessage().contains("Could not decrypt")); // expected
} }
} }