Browse Source

Removed broken MD160 support in Crypto

pull/67/head
catbref 4 years ago
parent
commit
ac15dfe789
  1. 8
      src/main/java/org/qortal/crypto/Crypto.java

8
src/main/java/org/qortal/crypto/Crypto.java

@ -5,7 +5,6 @@ import java.security.NoSuchAlgorithmException;
import java.util.Arrays; import java.util.Arrays;
import org.qortal.account.Account; import org.qortal.account.Account;
import org.qortal.block.BlockChain;
import org.qortal.utils.Base58; import org.qortal.utils.Base58;
import com.google.common.primitives.Bytes; import com.google.common.primitives.Bytes;
@ -59,17 +58,11 @@ public class Crypto {
return Bytes.concat(digest, digest); return Bytes.concat(digest, digest);
} }
@SuppressWarnings("deprecation")
private static String toAddress(byte addressVersion, byte[] input) { private static String toAddress(byte addressVersion, byte[] input) {
// SHA2-256 input to create new data and of known size // SHA2-256 input to create new data and of known size
byte[] inputHash = digest(input); byte[] inputHash = digest(input);
// Use RIPEMD160 to create shorter address // Use RIPEMD160 to create shorter address
if (BlockChain.getInstance().getUseBrokenMD160ForAddresses()) {
// Legacy BROKEN MD160
BrokenMD160 brokenMD160 = new BrokenMD160();
inputHash = brokenMD160.digest(inputHash);
} else {
// Use legit MD160 // Use legit MD160
try { try {
MessageDigest md160 = MessageDigest.getInstance("RIPEMD160"); MessageDigest md160 = MessageDigest.getInstance("RIPEMD160");
@ -77,7 +70,6 @@ public class Crypto {
} catch (NoSuchAlgorithmException e) { } catch (NoSuchAlgorithmException e) {
throw new RuntimeException("RIPEMD160 message digest not available"); throw new RuntimeException("RIPEMD160 message digest not available");
} }
}
// Create address data using above hash and addressVersion (prepended) // Create address data using above hash and addressVersion (prepended)
byte[] addressBytes = new byte[inputHash.length + 1]; byte[] addressBytes = new byte[inputHash.length + 1];

Loading…
Cancel
Save