zervo/bitaddress.org
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed hex/bytes conversion so that unit tests still pass.

Browse source
This commit is contained in:
Jeff Weiss 2013-04-06 23:07:30 -04:00
parent fa26e7d553
commit 2b5ca8a5f3
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
bitaddress.org.html
View file

@ -707,7 +707,7 @@
hex.push((bytes[i] >>> 4).toString(16)); hex.push((bytes[i] >>> 4).toString(16));
hex.push((bytes[i] & 0xF).toString(16)); hex.push((bytes[i] & 0xF).toString(16));
} }
return hex.join("").split(/^0+/).slice(-1)[0]; //drop leading 0 return hex.join("");
}, },
// Convert a hex string to a byte array // Convert a hex string to a byte array
@ -7505,6 +7505,8 @@
}, },
stripLeadZeros: function(hex) { return hex.split(/^0+/).slice(-1)[0]; },
// Split a private key and update information in the HTML // Split a private key and update information in the HTML
splitKey: function () { splitKey: function () {
try { try {
@ -7547,7 +7549,8 @@
var shares = document.getElementById("combineinput").value.split(/\W+/); var shares = document.getElementById("combineinput").value.split(/\W+/);
var combined = secrets.combine(shares.map(Bitcoin.Base58.decode). var combined = secrets.combine(shares.map(Bitcoin.Base58.decode).
map(Crypto.util.bytesToHex)); map(Crypto.util.bytesToHex).
map(this.stripLeadZeros));
var privkeyBase58 = Bitcoin.Base58.encode(Crypto.util.hexToBytes(combined)); var privkeyBase58 = Bitcoin.Base58.encode(Crypto.util.hexToBytes(combined));
var output = document.createElement("div"); var output = document.createElement("div");