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

MnemonicCode: Add null check for passphrase.

Browse Source 
The null check is added due to a likely undesirable outcome when supplying a null passphrase.
If allowed, the salt will be "mnemonicnull", when one would expect only "mnemonic" due to the
following from BIP39 "If a passphrase is not present, an empty string "" is used instead."
This commit is contained in:
David Kingsbury
2018-02-19 16:31:52 +01:00
committed by Andreas Schildbach
parent c4d1f200a9
commit 2acdb34948
2 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/main/java/org/bitcoinj/crypto/MnemonicCode.java
View File

@@ -34,6 +34,7 @@ import java.util.ArrayList;
import java.util.Collections; import java.util.Collections;
import java.util.List; import java.util.List;
import static com.google.common.base.Preconditions.checkNotNull;
import static org.bitcoinj.core.Utils.HEX; import static org.bitcoinj.core.Utils.HEX;
/** /**
@@ -119,6 +120,7 @@ public class MnemonicCode {
* Convert mnemonic word list to seed. * Convert mnemonic word list to seed.
*/ */
public static byte[] toSeed(List<String> words, String passphrase) { public static byte[] toSeed(List<String> words, String passphrase) {
checkNotNull(passphrase, "A null passphrase is not allowed.");
// To create binary seed from mnemonic, we use PBKDF2 function // To create binary seed from mnemonic, we use PBKDF2 function
// with mnemonic sentence (in UTF-8) used as a password and // with mnemonic sentence (in UTF-8) used as a password and

6
core/src/test/java/org/bitcoinj/crypto/MnemonicCodeTest.java
View File

@@ -212,6 +212,12 @@ public class MnemonicCodeTest {
mc.toMnemonic(entropy); mc.toMnemonic(entropy);
} }
@Test(expected = NullPointerException.class)
public void testNullPassphrase() throws Exception {
List<String> code = split("legal winner thank year wave sausage worth useful legal winner thank yellow");
MnemonicCode.toSeed(code, null);
}
public static List<String> split(String words) { public static List<String> split(String words) {
return new ArrayList<>(Arrays.asList(words.split("\\s+"))); return new ArrayList<>(Arrays.asList(words.split("\\s+")));
} }