mirrors/bitcoinj
1
0
Fork 0
mirror of https://github.com/bitcoinj/bitcoinj.git synced 2025-02-26 07:23:53 +01:00
Code Issues Projects Releases Packages Wiki Activity

Make Andreas happy. Resolves issue 423.

Browse source
This commit is contained in:
Mike Hearn 2013-07-10 16:23:05 +02:00
parent b51485ca23
commit 53dc5c2e6a
1 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
core/src/main/java/com/google/bitcoin/crypto/KeyCrypterScrypt.java
View file

@ -15,9 +15,9 @@
*/ */
package com.google.bitcoin.crypto; package com.google.bitcoin.crypto;
import java.io.Serializable; import com.google.common.base.Preconditions;
import java.security.SecureRandom; import com.google.protobuf.ByteString;
import com.lambdaworks.crypto.SCrypt;
import org.bitcoinj.wallet.Protos; import org.bitcoinj.wallet.Protos;
import org.bitcoinj.wallet.Protos.ScryptParameters; import org.bitcoinj.wallet.Protos.ScryptParameters;
import org.bitcoinj.wallet.Protos.Wallet.EncryptionType; import org.bitcoinj.wallet.Protos.Wallet.EncryptionType;
@ -30,9 +30,8 @@ import org.spongycastle.crypto.paddings.PaddedBufferedBlockCipher;
import org.spongycastle.crypto.params.KeyParameter; import org.spongycastle.crypto.params.KeyParameter;
import org.spongycastle.crypto.params.ParametersWithIV; import org.spongycastle.crypto.params.ParametersWithIV;
import com.google.common.base.Preconditions; import java.io.Serializable;
import com.google.protobuf.ByteString; import java.security.SecureRandom;
import com.lambdaworks.crypto.SCrypt;
/** /**
* <p>This class encrypts and decrypts byte arrays and strings using scrypt as the * <p>This class encrypts and decrypts byte arrays and strings using scrypt as the
@ -49,7 +48,7 @@ import com.lambdaworks.crypto.SCrypt;
* the AES symmetric cipher. Eight bytes of salt is used to prevent dictionary attacks.</p> * the AES symmetric cipher. Eight bytes of salt is used to prevent dictionary attacks.</p>
*/ */
public class KeyCrypterScrypt implements KeyCrypter, Serializable { public class KeyCrypterScrypt implements KeyCrypter, Serializable {
private static final Logger log = LoggerFactory.getLogger(KeyCrypterScrypt.class.getName()); private static final Logger log = LoggerFactory.getLogger(KeyCrypterScrypt.class);
private static final long serialVersionUID = 949662512049152670L; private static final long serialVersionUID = 949662512049152670L;
/** /**