Qortal/altcoinj
3
0
Fork 0
mirror of https://github.com/Qortal/altcoinj.git synced 2025-02-15 11:45:51 +00:00
Code Issues Projects Releases Wiki Activity

Allow overriding of encrypt/decrypt construction

Browse Source
This commit is contained in:
Devrandom 2014-10-27 13:14:22 -07:00 committed by Mike Hearn
parent 0a8c528ed8
commit 7356c75c8d
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
core/src/main/java/org/bitcoinj/wallet/DeterministicKeyChain.java
View File

@ -378,7 +378,7 @@ public class DeterministicKeyChain implements EncryptableKeyChain {
}
// For use in encryption.
private DeterministicKeyChain(KeyCrypter crypter, KeyParameter aesKey, DeterministicKeyChain chain) {
protected DeterministicKeyChain(KeyCrypter crypter, KeyParameter aesKey, DeterministicKeyChain chain) {
// Can't encrypt a watching chain.
checkNotNull(chain.rootKey);
checkNotNull(chain.seed);
@ -965,7 +965,7 @@ public class DeterministicKeyChain implements EncryptableKeyChain {
checkState(seed.isEncrypted());
String passphrase = DEFAULT_PASSPHRASE_FOR_MNEMONIC; // FIXME allow non-empty passphrase
DeterministicSeed decSeed = seed.decrypt(getKeyCrypter(), passphrase, aesKey);
DeterministicKeyChain chain = new DeterministicKeyChain(decSeed);
DeterministicKeyChain chain = makeDecryptedKeyChain(decSeed);
// Now double check that the keys match to catch the case where the key is wrong but padding didn't catch it.
if (!chain.getWatchingKey().getPubKeyPoint().equals(getWatchingKey().getPubKeyPoint()))
throw new KeyCrypterException("Provided AES key is wrong");
@ -987,6 +987,10 @@ public class DeterministicKeyChain implements EncryptableKeyChain {
return chain;
}
protected DeterministicKeyChain makeDecryptedKeyChain(DeterministicSeed decSeed) {
return new DeterministicKeyChain(decSeed);
}
@Override
public boolean checkPassword(CharSequence password) {
checkNotNull(password);