Merge pull request #112 from blockchain/pairing

fix(Pairing): convert password to hex before encrypting
blockchain · Feb 9, 2016 · 31bf65e · 31bf65e
2 parents 92df68a + febbf8a
commit 31bf65e
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/src/wallet.js b/src/wallet.js
@@ -775,7 +775,9 @@ function decryptAndInitializeWallet(success, error, decrypt_success, build_hd_su
 MyWallet.makePairingCode = function(success, error) {
   try {
     MyWallet.securePost('wallet', { method : 'pairing-encryption-password' }, function(encryption_phrase) {
-      success('1|' + MyWallet.wallet.guid + '|' + WalletCrypto.encrypt(MyWallet.wallet.sharedKey + '|' + WalletStore.getPassword(), encryption_phrase, 10));
+      var pwHex = new Buffer(WalletStore.getPassword()).toString('hex');
+      var encrypted = WalletCrypto.encrypt(MyWallet.wallet.sharedKey + '|' + pwHex, encryption_phrase, 10);
+      success('1|' + MyWallet.wallet.guid + '|' + encrypted);
     }, function(e) {
       error(e);
     });