diff options
| -rw-r--r-- | bip39-standalone.html | 5 | ||||
| -rw-r--r-- | src/js/jsbip39.js | 5 |
2 files changed, 6 insertions, 4 deletions
diff --git a/bip39-standalone.html b/bip39-standalone.html index 43b588a..6be3415 100644 --- a/bip39-standalone.html +++ b/bip39-standalone.html | |||
| @@ -39133,10 +39133,11 @@ var Mnemonic = function(language) { | |||
| 39133 | 39133 | ||
| 39134 | self.toSeed = function(mnemonic, passphrase) { | 39134 | self.toSeed = function(mnemonic, passphrase) { |
| 39135 | passphrase = passphrase || ''; | 39135 | passphrase = passphrase || ''; |
| 39136 | mnemonic = self.joinWords(self.splitWords(self.normalizeString(mnemonic))); // removes blanks | 39136 | mnemonic = self.joinWords(self.splitWords(mnemonic)); // removes duplicate blanks |
| 39137 | var mnemonicNormalized = self.normalizeString(mnemonic); | ||
| 39137 | passphrase = self.normalizeString(passphrase) | 39138 | passphrase = self.normalizeString(passphrase) |
| 39138 | passphrase = "mnemonic" + passphrase; | 39139 | passphrase = "mnemonic" + passphrase; |
| 39139 | var mnemonicBits = sjcl.codec.utf8String.toBits(mnemonic); | 39140 | var mnemonicBits = sjcl.codec.utf8String.toBits(mnemonicNormalized); |
| 39140 | var passphraseBits = sjcl.codec.utf8String.toBits(passphrase); | 39141 | var passphraseBits = sjcl.codec.utf8String.toBits(passphrase); |
| 39141 | var result = sjcl.misc.pbkdf2(mnemonicBits, passphraseBits, PBKDF2_ROUNDS, 512, hmacSHA512); | 39142 | var result = sjcl.misc.pbkdf2(mnemonicBits, passphraseBits, PBKDF2_ROUNDS, 512, hmacSHA512); |
| 39142 | var hashHex = sjcl.codec.hex.fromBits(result); | 39143 | var hashHex = sjcl.codec.hex.fromBits(result); |
diff --git a/src/js/jsbip39.js b/src/js/jsbip39.js index 67ba5a7..025f625 100644 --- a/src/js/jsbip39.js +++ b/src/js/jsbip39.js | |||
| @@ -130,10 +130,11 @@ var Mnemonic = function(language) { | |||
| 130 | 130 | ||
| 131 | self.toSeed = function(mnemonic, passphrase) { | 131 | self.toSeed = function(mnemonic, passphrase) { |
| 132 | passphrase = passphrase || ''; | 132 | passphrase = passphrase || ''; |
| 133 | mnemonic = self.joinWords(self.splitWords(self.normalizeString(mnemonic))); // removes blanks | 133 | mnemonic = self.joinWords(self.splitWords(mnemonic)); // removes duplicate blanks |
| 134 | var mnemonicNormalized = self.normalizeString(mnemonic); | ||
| 134 | passphrase = self.normalizeString(passphrase) | 135 | passphrase = self.normalizeString(passphrase) |
| 135 | passphrase = "mnemonic" + passphrase; | 136 | passphrase = "mnemonic" + passphrase; |
| 136 | var mnemonicBits = sjcl.codec.utf8String.toBits(mnemonic); | 137 | var mnemonicBits = sjcl.codec.utf8String.toBits(mnemonicNormalized); |
| 137 | var passphraseBits = sjcl.codec.utf8String.toBits(passphrase); | 138 | var passphraseBits = sjcl.codec.utf8String.toBits(passphrase); |
| 138 | var result = sjcl.misc.pbkdf2(mnemonicBits, passphraseBits, PBKDF2_ROUNDS, 512, hmacSHA512); | 139 | var result = sjcl.misc.pbkdf2(mnemonicBits, passphraseBits, PBKDF2_ROUNDS, 512, hmacSHA512); |
| 139 | var hashHex = sjcl.codec.hex.fromBits(result); | 140 | var hashHex = sjcl.codec.hex.fromBits(result); |