Qortal/altcoinj
1
0
Fork 1
mirror of https://github.com/Qortal/altcoinj.git synced 2025-11-03 22:17:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix thread safety issue when creating multiple wallets in parallel.

Browse Source
This commit is contained in:
Mike Hearn
2015-09-16 14:11:11 +01:00
committed by Andreas Schildbach
parent c0014078c5
commit a6380ea3d7
1 changed files with 9 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
core/src/main/java/org/bitcoinj/crypto/HDKeyDerivation.java
View File

@@ -16,19 +16,16 @@
package org.bitcoinj.crypto; package org.bitcoinj.crypto;
import org.bitcoinj.core.ECKey; import com.google.common.collect.*;
import org.bitcoinj.core.Utils; import org.bitcoinj.core.*;
import com.google.common.collect.ImmutableList; import org.spongycastle.math.ec.*;
import org.spongycastle.crypto.macs.HMac;
import org.spongycastle.math.ec.ECPoint;
import java.math.BigInteger; import java.math.*;
import java.nio.ByteBuffer; import java.nio.*;
import java.security.SecureRandom; import java.security.*;
import java.util.Arrays; import java.util.*;
import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Preconditions.*;
import static com.google.common.base.Preconditions.checkState;
/** /**
* Implementation of the <a href="https://github.com/bitcoin/bips/blob/master/bip-0032.mediawiki">BIP 32</a> * Implementation of the <a href="https://github.com/bitcoin/bips/blob/master/bip-0032.mediawiki">BIP 32</a>
@@ -54,8 +51,6 @@ public final class HDKeyDerivation {
*/ */
public static final int MAX_CHILD_DERIVATION_ATTEMPTS = 100; public static final int MAX_CHILD_DERIVATION_ATTEMPTS = 100;
public static final HMac MASTER_HMAC_SHA512 = HDUtils.createHmacSha512Digest("Bitcoin seed".getBytes());
/** /**
* Generates a new deterministic key from the given seed, which can be any arbitrary byte array. However resist * Generates a new deterministic key from the given seed, which can be any arbitrary byte array. However resist
* the temptation to use a string as the seed - any key derived from a password is likely to be weak and easily * the temptation to use a string as the seed - any key derived from a password is likely to be weak and easily
@@ -68,7 +63,7 @@ public final class HDKeyDerivation {
public static DeterministicKey createMasterPrivateKey(byte[] seed) throws HDDerivationException { public static DeterministicKey createMasterPrivateKey(byte[] seed) throws HDDerivationException {
checkArgument(seed.length > 8, "Seed is too short and could be brute forced"); checkArgument(seed.length > 8, "Seed is too short and could be brute forced");
// Calculate I = HMAC-SHA512(key="Bitcoin seed", msg=S) // Calculate I = HMAC-SHA512(key="Bitcoin seed", msg=S)
byte[] i = HDUtils.hmacSha512(MASTER_HMAC_SHA512, seed); byte[] i = HDUtils.hmacSha512(HDUtils.createHmacSha512Digest("Bitcoin seed".getBytes()), seed);
// Split I into two 32-byte sequences, Il and Ir. // Split I into two 32-byte sequences, Il and Ir.
// Use Il as master secret key, and Ir as master chain code. // Use Il as master secret key, and Ir as master chain code.
checkState(i.length == 64, i.length); checkState(i.length == 64, i.length);