X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=src%2Fjs%2Fjsbip39.js;h=67ba5a7829dbd6927b85d91db52f82a1a34b1aee;hb=32fab2c39507357909438c2be8cd100c6539038f;hp=455615a907c26807d842cf7514435b2482fca11e;hpb=87240b1eabbc9af78ed2bd1e8b2ef430cd4a2af2;p=perso%2FImmae%2FProjets%2FCryptomonnaies%2FBIP39.git

diff --git a/src/js/jsbip39.js b/src/js/jsbip39.js
index 455615a..67ba5a7 100644
--- a/src/js/jsbip39.js
+++ b/src/js/jsbip39.js
@@ -93,12 +93,12 @@ var Mnemonic = function(language) {
             var idx = parseInt(b.substring(i * 11, (i + 1) * 11), 2);
             result.push(wordlist[idx]);
         }
-        return result.join(' ');
+        return self.joinWords(result);
     }
 
     self.check = function(mnemonic) {
-        var mnemonic = mnemonic.split(' ')
-        if (mnemonic.length % 3 > 0) {
+        var mnemonic = self.splitWords(mnemonic);
+        if (mnemonic.length == 0 || mnemonic.length % 3 > 0) {
             return false
         }
         // idx = map(lambda x: bin(self.wordlist.index(x))[2:].zfill(11), mnemonic)
@@ -130,7 +130,7 @@ var Mnemonic = function(language) {
 
     self.toSeed = function(mnemonic, passphrase) {
         passphrase = passphrase || '';
-        mnemonic = self.normalizeString(mnemonic).split(' ').filter(function(x) { return x.length; }).join(' ');
+        mnemonic = self.joinWords(self.splitWords(self.normalizeString(mnemonic))); // removes blanks
         passphrase = self.normalizeString(passphrase)
         passphrase = "mnemonic" + passphrase;
         var mnemonicBits = sjcl.codec.utf8String.toBits(mnemonic);
@@ -140,6 +140,20 @@ var Mnemonic = function(language) {
         return hashHex;
     }
 
+    self.splitWords = function(mnemonic) {
+        return mnemonic.split(/\s/g).filter(function(x) { return x.length; });
+    }
+
+    self.joinWords = function(words) {
+        // Set space correctly depending on the language
+        // see https://github.com/bitcoin/bips/blob/master/bip-0039/bip-0039-wordlists.md#japanese
+        var space = " ";
+        if (language == "japanese") {
+            space = "\u3000"; // ideographic space
+        }
+        return words.join(space);
+    }
+
     self.normalizeString = function(str) {
         if (typeof str.normalize == "function") {
             return str.normalize("NFKD");