mirrors/bitcoinj
1
0
Fork 0
mirror of https://github.com/bitcoinj/bitcoinj.git synced 2025-03-10 09:20:04 +01:00
Code Issues Projects Releases Packages Wiki Activity

replace Guava Bytes.concat() with own ByteUtils.concat()

Browse source
This commit is contained in:
Sean Gilligan 2023-09-15 17:53:05 -07:00 • committed by Andreas Schildbach
parent daa4da8d9f
commit bce4475aaf
5 changed files with 25 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
core/src/main/java/org/bitcoinj/base/internal/ByteUtils.java
View file

@ -742,4 +742,17 @@ public class ByteUtils {
private static int compareUnsigned(byte a, byte b) { private static int compareUnsigned(byte a, byte b) {
return Byte.toUnsignedInt(a) - Byte.toUnsignedInt(b); return Byte.toUnsignedInt(a) - Byte.toUnsignedInt(b);
} }
/**
* Concatentate two byte arrays
* @param b1 first byte array
* @param b2 second byte array
* @return new concatenated byte array
*/
public static byte[] concat(byte[] b1, byte[] b2) {
byte[] result = new byte[b1.length + b2.length];
System.arraycopy(b1, 0, result, 0, b1.length);
System.arraycopy(b2, 0, result, b1.length, b2.length);
return result;
}
} }

9
core/src/main/java/org/bitcoinj/crypto/BIP38PrivateKey.java
View file

@ -16,7 +16,6 @@
package org.bitcoinj.crypto; package org.bitcoinj.crypto;
import com.google.common.primitives.Bytes;
import org.bitcoinj.base.Network; import org.bitcoinj.base.Network;
import org.bitcoinj.base.ScriptType; import org.bitcoinj.base.ScriptType;
import org.bitcoinj.base.internal.ByteUtils; import org.bitcoinj.base.internal.ByteUtils;
@ -169,14 +168,14 @@ public class BIP38PrivateKey extends EncodedPrivateKey {
byte[] passFactorBytes = SCrypt.generate(normalizedPassphrase.getBytes(StandardCharsets.UTF_8), ownerSalt, 16384, 8, 8, 32); byte[] passFactorBytes = SCrypt.generate(normalizedPassphrase.getBytes(StandardCharsets.UTF_8), ownerSalt, 16384, 8, 8, 32);
if (hasLotAndSequence) { if (hasLotAndSequence) {
byte[] hashBytes = Bytes.concat(passFactorBytes, ownerEntropy); byte[] hashBytes = ByteUtils.concat(passFactorBytes, ownerEntropy);
checkState(hashBytes.length == 40); checkState(hashBytes.length == 40);
passFactorBytes = Sha256Hash.hashTwice(hashBytes); passFactorBytes = Sha256Hash.hashTwice(hashBytes);
} }
BigInteger passFactor = ByteUtils.bytesToBigInteger(passFactorBytes); BigInteger passFactor = ByteUtils.bytesToBigInteger(passFactorBytes);
ECKey k = ECKey.fromPrivate(passFactor, true); ECKey k = ECKey.fromPrivate(passFactor, true);
byte[] salt = Bytes.concat(addressHash, ownerEntropy); byte[] salt = ByteUtils.concat(addressHash, ownerEntropy);
checkState(salt.length == 12); checkState(salt.length == 12);
byte[] derived = SCrypt.generate(k.getPubKey(), salt, 1024, 1, 1, 64); byte[] derived = SCrypt.generate(k.getPubKey(), salt, 1024, 1, 1, 64);
byte[] aeskey = Arrays.copyOfRange(derived, 32, 64); byte[] aeskey = Arrays.copyOfRange(derived, 32, 64);
@ -191,13 +190,13 @@ public class BIP38PrivateKey extends EncodedPrivateKey {
for (int i = 0; i < 16; i++) for (int i = 0; i < 16; i++)
decrypted2[i] ^= derived[i + 16]; decrypted2[i] ^= derived[i + 16];
byte[] encrypted1 = Bytes.concat(Arrays.copyOfRange(content, 8, 16), Arrays.copyOfRange(decrypted2, 0, 8)); byte[] encrypted1 = ByteUtils.concat(Arrays.copyOfRange(content, 8, 16), Arrays.copyOfRange(decrypted2, 0, 8));
byte[] decrypted1 = cipher.doFinal(encrypted1); byte[] decrypted1 = cipher.doFinal(encrypted1);
checkState(decrypted1.length == 16); checkState(decrypted1.length == 16);
for (int i = 0; i < 16; i++) for (int i = 0; i < 16; i++)
decrypted1[i] ^= derived[i]; decrypted1[i] ^= derived[i];
byte[] seed = Bytes.concat(decrypted1, Arrays.copyOfRange(decrypted2, 8, 16)); byte[] seed = ByteUtils.concat(decrypted1, Arrays.copyOfRange(decrypted2, 8, 16));
checkState(seed.length == 24); checkState(seed.length == 24);
BigInteger seedFactor = ByteUtils.bytesToBigInteger(Sha256Hash.hashTwice(seed)); BigInteger seedFactor = ByteUtils.bytesToBigInteger(Sha256Hash.hashTwice(seed));
checkState(passFactor.signum() >= 0); checkState(passFactor.signum() >= 0);

4
core/src/main/java/org/bitcoinj/crypto/utils/MessageVerifyUtils.java
View file

@ -1,9 +1,9 @@
package org.bitcoinj.crypto.utils; package org.bitcoinj.crypto.utils;
import com.google.common.primitives.Bytes;
import org.bitcoinj.base.LegacyAddress; import org.bitcoinj.base.LegacyAddress;
import org.bitcoinj.base.ScriptType; import org.bitcoinj.base.ScriptType;
import org.bitcoinj.base.Address; import org.bitcoinj.base.Address;
import org.bitcoinj.base.internal.ByteUtils;
import org.bitcoinj.crypto.ECKey; import org.bitcoinj.crypto.ECKey;
import org.bitcoinj.base.SegwitAddress; import org.bitcoinj.base.SegwitAddress;
import org.bitcoinj.crypto.internal.CryptoUtils; import org.bitcoinj.crypto.internal.CryptoUtils;
@ -128,6 +128,6 @@ public class MessageVerifyUtils {
// 0x14 is OP_PUSH_20, pushes the next 20 bytes (=length of the pubkeyHash) on the stack // 0x14 is OP_PUSH_20, pushes the next 20 bytes (=length of the pubkeyHash) on the stack
// (it's safe to hardcode version 0 here, as P2SH-wrapping is only defined for segwit version 0) // (it's safe to hardcode version 0 here, as P2SH-wrapping is only defined for segwit version 0)
final byte[] scriptPubKeyPrefix = {0x00, 0x14}; final byte[] scriptPubKeyPrefix = {0x00, 0x14};
return Bytes.concat(scriptPubKeyPrefix, pubKeyHash); return ByteUtils.concat(scriptPubKeyPrefix, pubKeyHash);
} }
} }

3
core/src/test/java/org/bitcoinj/crypto/ECKeyTest.java
View file

@ -18,7 +18,6 @@
package org.bitcoinj.crypto; package org.bitcoinj.crypto;
import com.google.common.collect.Lists; import com.google.common.collect.Lists;
import com.google.common.primitives.Bytes;
import org.bitcoinj.base.Address; import org.bitcoinj.base.Address;
import org.bitcoinj.base.LegacyAddress; import org.bitcoinj.base.LegacyAddress;
import org.bitcoinj.base.ScriptType; import org.bitcoinj.base.ScriptType;
@ -310,7 +309,7 @@ public class ECKeyTest {
Address expectedAddress = LegacyAddress.fromBase58("3HnHC8dJCqixUBFNYXdz2LFXQwvAkkTR3m", MAINNET); Address expectedAddress = LegacyAddress.fromBase58("3HnHC8dJCqixUBFNYXdz2LFXQwvAkkTR3m", MAINNET);
ECKey key = ECKey.signedMessageToKey(message, sigBase64); ECKey key = ECKey.signedMessageToKey(message, sigBase64);
final byte[] segwitV0_OpPush20 = {0x00, 0x14}; final byte[] segwitV0_OpPush20 = {0x00, 0x14};
byte[] segwitV0ScriptPubKey = Bytes.concat(segwitV0_OpPush20, key.getPubKeyHash()); // as defined in BIP 141 byte[] segwitV0ScriptPubKey = ByteUtils.concat(segwitV0_OpPush20, key.getPubKeyHash()); // as defined in BIP 141
byte[] scriptHashOfSegwitScript = CryptoUtils.sha256hash160(segwitV0ScriptPubKey); byte[] scriptHashOfSegwitScript = CryptoUtils.sha256hash160(segwitV0ScriptPubKey);
Address gotAddress = LegacyAddress.fromScriptHash(MAINNET, scriptHashOfSegwitScript); Address gotAddress = LegacyAddress.fromScriptHash(MAINNET, scriptHashOfSegwitScript);
assertEquals(expectedAddress, gotAddress); assertEquals(expectedAddress, gotAddress);

10
core/src/test/java/org/bitcoinj/script/ScriptChunkTest.java
View file

@ -16,8 +16,8 @@
package org.bitcoinj.script; package org.bitcoinj.script;
import com.google.common.primitives.Bytes;
import nl.jqno.equalsverifier.EqualsVerifier; import nl.jqno.equalsverifier.EqualsVerifier;
import org.bitcoinj.base.internal.ByteUtils;
import org.junit.Test; import org.junit.Test;
import java.util.Random; import java.util.Random;
@ -96,7 +96,7 @@ public class ScriptChunkTest {
for (byte len = 1; len < OP_PUSHDATA1; len++) { for (byte len = 1; len < OP_PUSHDATA1; len++) {
byte[] bytes = new byte[len]; byte[] bytes = new byte[len];
RANDOM.nextBytes(bytes); RANDOM.nextBytes(bytes);
byte[] expected = Bytes.concat(new byte[] { len }, bytes); byte[] expected = ByteUtils.concat(new byte[] { len }, bytes);
byte[] actual = new ScriptChunk(len, bytes).toByteArray(); byte[] actual = new ScriptChunk(len, bytes).toByteArray();
assertArrayEquals(expected, actual); assertArrayEquals(expected, actual);
} }
@ -107,7 +107,7 @@ public class ScriptChunkTest {
// OP_PUSHDATA1 // OP_PUSHDATA1
byte[] bytes = new byte[0xFF]; byte[] bytes = new byte[0xFF];
RANDOM.nextBytes(bytes); RANDOM.nextBytes(bytes);
byte[] expected = Bytes.concat(new byte[] { OP_PUSHDATA1, (byte) 0xFF }, bytes); byte[] expected = ByteUtils.concat(new byte[] { OP_PUSHDATA1, (byte) 0xFF }, bytes);
byte[] actual = new ScriptChunk(OP_PUSHDATA1, bytes).toByteArray(); byte[] actual = new ScriptChunk(OP_PUSHDATA1, bytes).toByteArray();
assertArrayEquals(expected, actual); assertArrayEquals(expected, actual);
} }
@ -117,7 +117,7 @@ public class ScriptChunkTest {
// OP_PUSHDATA2 // OP_PUSHDATA2
byte[] bytes = new byte[0x0102]; byte[] bytes = new byte[0x0102];
RANDOM.nextBytes(bytes); RANDOM.nextBytes(bytes);
byte[] expected = Bytes.concat(new byte[] { OP_PUSHDATA2, 0x02, 0x01 }, bytes); byte[] expected = ByteUtils.concat(new byte[] { OP_PUSHDATA2, 0x02, 0x01 }, bytes);
byte[] actual = new ScriptChunk(OP_PUSHDATA2, bytes).toByteArray(); byte[] actual = new ScriptChunk(OP_PUSHDATA2, bytes).toByteArray();
assertArrayEquals(expected, actual); assertArrayEquals(expected, actual);
} }
@ -127,7 +127,7 @@ public class ScriptChunkTest {
// OP_PUSHDATA4 // OP_PUSHDATA4
byte[] bytes = new byte[0x0102]; byte[] bytes = new byte[0x0102];
RANDOM.nextBytes(bytes); RANDOM.nextBytes(bytes);
byte[] expected = Bytes.concat(new byte[] { OP_PUSHDATA4, 0x02, 0x01, 0x00, 0x00 }, bytes); byte[] expected = ByteUtils.concat(new byte[] { OP_PUSHDATA4, 0x02, 0x01, 0x00, 0x00 }, bytes);
byte[] actual = new ScriptChunk(OP_PUSHDATA4, bytes).toByteArray(); byte[] actual = new ScriptChunk(OP_PUSHDATA4, bytes).toByteArray();
assertArrayEquals(expected, actual); assertArrayEquals(expected, actual);
} }