From: Ian Coleman Date: Sat, 27 Sep 2014 11:50:48 +0000 (+1000) Subject: mnemonic.normalizeString method made public X-Git-Url: https://git.immae.eu/?a=commitdiff_plain;h=be6ba9a836bebfb245c0d139436e728296485e5e;hp=3f45abbf926973fa2f37ebba8e58ba2d9c25c8c8;p=perso%2FImmae%2FProjets%2FCryptomonnaies%2FBIP39.git mnemonic.normalizeString method made public --- diff --git a/bip39-standalone.html b/bip39-standalone.html index 41634c2..b062b2e 100644 --- a/bip39-standalone.html +++ b/bip39-standalone.html @@ -22432,14 +22432,14 @@ var Mnemonic = function(language) { self.toSeed = function(mnemonic, passphrase) { passphrase = passphrase || ''; - mnemonic = normalizeString(mnemonic) - passphrase = normalizeString(passphrase) + mnemonic = self.normalizeString(mnemonic) + passphrase = self.normalizeString(passphrase) passphrase = "mnemonic" + passphrase; //return PBKDF2(mnemonic, 'mnemonic' + passphrase, iterations=PBKDF2_ROUNDS, macmodule=hmac, digestmodule=hashlib.sha512).read(64) return asmCrypto.PBKDF2_HMAC_SHA512.hex(mnemonic, passphrase, PBKDF2_ROUNDS, 512/8); } - function normalizeString(str) { + self.normalizeString = function(str) { if (typeof str.normalize == "function") { return str.normalize("NFKD"); } diff --git a/src/js/jsbip39.js b/src/js/jsbip39.js index d0ac3ae..7acf77b 100644 --- a/src/js/jsbip39.js +++ b/src/js/jsbip39.js @@ -121,14 +121,14 @@ var Mnemonic = function(language) { self.toSeed = function(mnemonic, passphrase) { passphrase = passphrase || ''; - mnemonic = normalizeString(mnemonic) - passphrase = normalizeString(passphrase) + mnemonic = self.normalizeString(mnemonic) + passphrase = self.normalizeString(passphrase) passphrase = "mnemonic" + passphrase; //return PBKDF2(mnemonic, 'mnemonic' + passphrase, iterations=PBKDF2_ROUNDS, macmodule=hmac, digestmodule=hashlib.sha512).read(64) return asmCrypto.PBKDF2_HMAC_SHA512.hex(mnemonic, passphrase, PBKDF2_ROUNDS, 512/8); } - function normalizeString(str) { + self.normalizeString = function(str) { if (typeof str.normalize == "function") { return str.normalize("NFKD"); }