self.toSeed = function(mnemonic, passphrase) {
passphrase = passphrase || '';
- mnemonic = self.joinWords(self.splitWords(self.normalizeString(mnemonic))); // removes blanks
+ mnemonic = self.joinWords(self.splitWords(mnemonic)); // removes duplicate blanks
+ var mnemonicNormalized = self.normalizeString(mnemonic);
passphrase = self.normalizeString(passphrase)
passphrase = "mnemonic" + passphrase;
- var mnemonicBits = sjcl.codec.utf8String.toBits(mnemonic);
+ var mnemonicBits = sjcl.codec.utf8String.toBits(mnemonicNormalized);
var passphraseBits = sjcl.codec.utf8String.toBits(passphrase);
var result = sjcl.misc.pbkdf2(mnemonicBits, passphraseBits, PBKDF2_ROUNDS, 512, hmacSHA512);
var hashHex = sjcl.codec.hex.fromBits(result);
}
self.normalizeString = function(str) {
- if (typeof str.normalize == "function") {
- return str.normalize("NFKD");
- }
- else {
- // TODO decide how to handle this in the future.
- // https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String/normalize
- return str;
- }
+ return str.normalize("NFKD");
}
function byteArrayToWordArray(data) {