Qortal/altcoinj
3
0
Fork 0
mirror of https://github.com/Qortal/altcoinj.git synced 2025-01-31 23:32:16 +00:00
Code Issues Projects Releases Wiki Activity

Don't dump the salt bytes in toString() and change how it's printed.

Browse Source
This commit is contained in:
Mike Hearn 2013-03-15 16:08:04 +01:00
parent 732c5e631e
commit 7799024c5c
2 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
core/src/main/java/com/google/bitcoin/core/Wallet.java
View File

@ -2163,6 +2163,9 @@ public class Wallet implements Serializable, BlockChainListener {
builder.append(String.format(" %d dead transactions%n", dead.size())); builder.append(String.format(" %d dead transactions%n", dead.size()));
builder.append(String.format("Last seen best block: (%d) %s%n", builder.append(String.format("Last seen best block: (%d) %s%n",
getLastBlockSeenHeight(), getLastBlockSeenHash())); getLastBlockSeenHeight(), getLastBlockSeenHash()));
if (this.keyCrypter != null) {
builder.append(String.format("Encryption: %s%n", keyCrypter.toString()));
}
// Do the keys. // Do the keys.
builder.append("\nKeys:\n"); builder.append("\nKeys:\n");
for (ECKey key : keychain) { for (ECKey key : keychain) {
@ -2193,10 +2196,6 @@ public class Wallet implements Serializable, BlockChainListener {
builder.append("\nDEAD:\n"); builder.append("\nDEAD:\n");
toStringHelper(builder, dead, chain); toStringHelper(builder, dead, chain);
} }
// Add the keyCrypter so that any setup parameters are in the wallet toString.
if (this.keyCrypter != null) {
builder.append("\nkeyCrypter: " + keyCrypter.toString());
}
return builder.toString(); return builder.toString();
} finally { } finally {
lock.unlock(); lock.unlock();

7
core/src/main/java/com/google/bitcoin/crypto/KeyCrypterScrypt.java
View File

@ -139,11 +139,6 @@ public class KeyCrypterScrypt implements KeyCrypter, Serializable {
/** /**
* Password based encryption using AES - CBC 256 bits. * Password based encryption using AES - CBC 256 bits.
*
* @param plain The bytes to encrypt
* @param aesKey The AES key to use for encryption
* @return EncryptedPrivateKey containing IV and the encrypted private key
* @throws KeyCrypterException
*/ */
@Override @Override
public EncryptedPrivateKey encrypt(byte[] plainBytes, KeyParameter aesKey) throws KeyCrypterException { public EncryptedPrivateKey encrypt(byte[] plainBytes, KeyParameter aesKey) throws KeyCrypterException {
@ -239,7 +234,7 @@ public class KeyCrypterScrypt implements KeyCrypter, Serializable {
@Override @Override
public String toString() { public String toString() {
return "EncrypterDecrypterScrypt [scryptParameters=" + scryptParameters.toString() + "]"; return "Scrypt/AES";
} }
@Override @Override