mnemonic.normalizeString method made public

This commit is contained in:
Ian Coleman
2014-09-27 21:50:48 +10:00
parent 3f45abbf92
commit be6ba9a836
2 changed files with 6 additions and 6 deletions
+3 -3
View File
@@ -22432,14 +22432,14 @@ var Mnemonic = function(language) {
self.toSeed = function(mnemonic, passphrase) { self.toSeed = function(mnemonic, passphrase) {
passphrase = passphrase || ''; passphrase = passphrase || '';
mnemonic = normalizeString(mnemonic) mnemonic = self.normalizeString(mnemonic)
passphrase = normalizeString(passphrase) passphrase = self.normalizeString(passphrase)
passphrase = "mnemonic" + passphrase; passphrase = "mnemonic" + passphrase;
//return PBKDF2(mnemonic, 'mnemonic' + passphrase, iterations=PBKDF2_ROUNDS, macmodule=hmac, digestmodule=hashlib.sha512).read(64) //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); return asmCrypto.PBKDF2_HMAC_SHA512.hex(mnemonic, passphrase, PBKDF2_ROUNDS, 512/8);
} }
function normalizeString(str) { self.normalizeString = function(str) {
if (typeof str.normalize == "function") { if (typeof str.normalize == "function") {
return str.normalize("NFKD"); return str.normalize("NFKD");
} }
+3 -3
View File
@@ -121,14 +121,14 @@ var Mnemonic = function(language) {
self.toSeed = function(mnemonic, passphrase) { self.toSeed = function(mnemonic, passphrase) {
passphrase = passphrase || ''; passphrase = passphrase || '';
mnemonic = normalizeString(mnemonic) mnemonic = self.normalizeString(mnemonic)
passphrase = normalizeString(passphrase) passphrase = self.normalizeString(passphrase)
passphrase = "mnemonic" + passphrase; passphrase = "mnemonic" + passphrase;
//return PBKDF2(mnemonic, 'mnemonic' + passphrase, iterations=PBKDF2_ROUNDS, macmodule=hmac, digestmodule=hashlib.sha512).read(64) //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); return asmCrypto.PBKDF2_HMAC_SHA512.hex(mnemonic, passphrase, PBKDF2_ROUNDS, 512/8);
} }
function normalizeString(str) { self.normalizeString = function(str) {
if (typeof str.normalize == "function") { if (typeof str.normalize == "function") {
return str.normalize("NFKD"); return str.normalize("NFKD");
} }