diff options
author | Ian Coleman <ian@iancoleman.io> | 2019-09-13 10:01:32 +1000 |
---|---|---|
committer | Ian Coleman <ian@iancoleman.io> | 2019-09-13 10:15:15 +1000 |
commit | 5b689bd6e77f047eff37e43f0ffa487cb59edc45 (patch) | |
tree | 63f30066d5b62a19c63fb2c561bd8f44a53af9f4 | |
parent | ac537983d9a89d2f5cc022dc4aa32dc24bcbda86 (diff) | |
download | BIP39-5b689bd6e77f047eff37e43f0ffa487cb59edc45.tar.gz BIP39-5b689bd6e77f047eff37e43f0ffa487cb59edc45.tar.zst BIP39-5b689bd6e77f047eff37e43f0ffa487cb59edc45.zip |
Fix trailing whitespace
-rw-r--r-- | src/js/bitcoinjs-3.3.2.js | 6 | ||||
-rw-r--r-- | src/js/bitcoinjs-bip38-2.0.2.js | 20 | ||||
-rw-r--r-- | src/js/casinocoin-util.js | 3 | ||||
-rw-r--r-- | src/js/nebulas-account.js | 18 | ||||
-rw-r--r-- | src/js/ripple-util.js | 4 | ||||
-rw-r--r-- | src/js/segwit-parameters.js | 6 | ||||
-rw-r--r-- | src/js/sjcl-bip39.js | 70 | ||||
-rw-r--r-- | src/js/stellar-util.js | 18 |
8 files changed, 72 insertions, 73 deletions
diff --git a/src/js/bitcoinjs-3.3.2.js b/src/js/bitcoinjs-3.3.2.js index 2390168..76f57e7 100644 --- a/src/js/bitcoinjs-3.3.2.js +++ b/src/js/bitcoinjs-3.3.2.js | |||
@@ -8596,13 +8596,13 @@ module.exports={ | |||
8596 | "OP_CHECKMULTISIGVERIFY": 175, | 8596 | "OP_CHECKMULTISIGVERIFY": 175, |
8597 | 8597 | ||
8598 | "OP_NOP1": 176, | 8598 | "OP_NOP1": 176, |
8599 | 8599 | ||
8600 | "OP_NOP2": 177, | 8600 | "OP_NOP2": 177, |
8601 | "OP_CHECKLOCKTIMEVERIFY": 177, | 8601 | "OP_CHECKLOCKTIMEVERIFY": 177, |
8602 | 8602 | ||
8603 | "OP_NOP3": 178, | 8603 | "OP_NOP3": 178, |
8604 | "OP_CHECKSEQUENCEVERIFY": 178, | 8604 | "OP_CHECKSEQUENCEVERIFY": 178, |
8605 | 8605 | ||
8606 | "OP_NOP4": 179, | 8606 | "OP_NOP4": 179, |
8607 | "OP_NOP5": 180, | 8607 | "OP_NOP5": 180, |
8608 | "OP_NOP6": 181, | 8608 | "OP_NOP6": 181, |
@@ -15165,4 +15165,4 @@ module.exports = { | |||
15165 | 15165 | ||
15166 | }).call(this,require("buffer").Buffer) | 15166 | }).call(this,require("buffer").Buffer) |
15167 | },{"bs58check":83,"buffer":5}]},{},[34])(34) | 15167 | },{"bs58check":83,"buffer":5}]},{},[34])(34) |
15168 | }); \ No newline at end of file | 15168 | }); |
diff --git a/src/js/bitcoinjs-bip38-2.0.2.js b/src/js/bitcoinjs-bip38-2.0.2.js index ea38715..57c1168 100644 --- a/src/js/bitcoinjs-bip38-2.0.2.js +++ b/src/js/bitcoinjs-bip38-2.0.2.js | |||
@@ -18123,7 +18123,7 @@ module.exports = function privateDecrypt(private_key, enc, reverse) { | |||
18123 | } else { | 18123 | } else { |
18124 | padding = 4; | 18124 | padding = 4; |
18125 | } | 18125 | } |
18126 | 18126 | ||
18127 | var key = parseKeys(private_key); | 18127 | var key = parseKeys(private_key); |
18128 | var k = key.modulus.byteLength(); | 18128 | var k = key.modulus.byteLength(); |
18129 | if (enc.length > k || new bn(enc).cmp(key.modulus) >= 0) { | 18129 | if (enc.length > k || new bn(enc).cmp(key.modulus) >= 0) { |
@@ -22690,13 +22690,13 @@ Script.prototype.runInContext = function (context) { | |||
22690 | if (!(context instanceof Context)) { | 22690 | if (!(context instanceof Context)) { |
22691 | throw new TypeError("needs a 'context' argument."); | 22691 | throw new TypeError("needs a 'context' argument."); |
22692 | } | 22692 | } |
22693 | 22693 | ||
22694 | var iframe = document.createElement('iframe'); | 22694 | var iframe = document.createElement('iframe'); |
22695 | if (!iframe.style) iframe.style = {}; | 22695 | if (!iframe.style) iframe.style = {}; |
22696 | iframe.style.display = 'none'; | 22696 | iframe.style.display = 'none'; |
22697 | 22697 | ||
22698 | document.body.appendChild(iframe); | 22698 | document.body.appendChild(iframe); |
22699 | 22699 | ||
22700 | var win = iframe.contentWindow; | 22700 | var win = iframe.contentWindow; |
22701 | var wEval = win.eval, wExecScript = win.execScript; | 22701 | var wEval = win.eval, wExecScript = win.execScript; |
22702 | 22702 | ||
@@ -22705,7 +22705,7 @@ Script.prototype.runInContext = function (context) { | |||
22705 | wExecScript.call(win, 'null'); | 22705 | wExecScript.call(win, 'null'); |
22706 | wEval = win.eval; | 22706 | wEval = win.eval; |
22707 | } | 22707 | } |
22708 | 22708 | ||
22709 | forEach(Object_keys(context), function (key) { | 22709 | forEach(Object_keys(context), function (key) { |
22710 | win[key] = context[key]; | 22710 | win[key] = context[key]; |
22711 | }); | 22711 | }); |
@@ -22714,11 +22714,11 @@ Script.prototype.runInContext = function (context) { | |||
22714 | win[key] = context[key]; | 22714 | win[key] = context[key]; |
22715 | } | 22715 | } |
22716 | }); | 22716 | }); |
22717 | 22717 | ||
22718 | var winKeys = Object_keys(win); | 22718 | var winKeys = Object_keys(win); |
22719 | 22719 | ||
22720 | var res = wEval.call(win, this.code); | 22720 | var res = wEval.call(win, this.code); |
22721 | 22721 | ||
22722 | forEach(Object_keys(win), function (key) { | 22722 | forEach(Object_keys(win), function (key) { |
22723 | // Avoid copying circular objects like `top` and `window` by only | 22723 | // Avoid copying circular objects like `top` and `window` by only |
22724 | // updating existing context properties or new properties in the `win` | 22724 | // updating existing context properties or new properties in the `win` |
@@ -22733,9 +22733,9 @@ Script.prototype.runInContext = function (context) { | |||
22733 | defineProp(context, key, win[key]); | 22733 | defineProp(context, key, win[key]); |
22734 | } | 22734 | } |
22735 | }); | 22735 | }); |
22736 | 22736 | ||
22737 | document.body.removeChild(iframe); | 22737 | document.body.removeChild(iframe); |
22738 | 22738 | ||
22739 | return res; | 22739 | return res; |
22740 | }; | 22740 | }; |
22741 | 22741 | ||
@@ -27914,4 +27914,4 @@ Sha512.prototype._hash = function () { | |||
27914 | module.exports = Sha512 | 27914 | module.exports = Sha512 |
27915 | 27915 | ||
27916 | },{"./hash":195,"inherits":189,"safe-buffer":193}]},{},[150])(150) | 27916 | },{"./hash":195,"inherits":189,"safe-buffer":193}]},{},[150])(150) |
27917 | }); \ No newline at end of file | 27917 | }); |
diff --git a/src/js/casinocoin-util.js b/src/js/casinocoin-util.js index f76e989..ac40c5a 100644 --- a/src/js/casinocoin-util.js +++ b/src/js/casinocoin-util.js | |||
@@ -6,5 +6,4 @@ function convertCasinoCoinAdrr(address) { | |||
6 | 6 | ||
7 | function convertCasinoCoinPriv(priv) { | 7 | function convertCasinoCoinPriv(priv) { |
8 | return window.basex('123456789ABCDEFGHJKLMNPQRSTUVWXYZabcdefghijkmnopqrstuvwxyz').decode(priv).toString("hex").slice(2,66) | 8 | return window.basex('123456789ABCDEFGHJKLMNPQRSTUVWXYZabcdefghijkmnopqrstuvwxyz').decode(priv).toString("hex").slice(2,66) |
9 | } | 9 | } |
10 | |||
diff --git a/src/js/nebulas-account.js b/src/js/nebulas-account.js index 45d8724..bded3e9 100644 --- a/src/js/nebulas-account.js +++ b/src/js/nebulas-account.js | |||
@@ -21709,7 +21709,7 @@ module.exports = function privateDecrypt(private_key, enc, reverse) { | |||
21709 | } else { | 21709 | } else { |
21710 | padding = 4; | 21710 | padding = 4; |
21711 | } | 21711 | } |
21712 | 21712 | ||
21713 | var key = parseKeys(private_key); | 21713 | var key = parseKeys(private_key); |
21714 | var k = key.modulus.byteLength(); | 21714 | var k = key.modulus.byteLength(); |
21715 | if (enc.length > k || new bn(enc).cmp(key.modulus) >= 0) { | 21715 | if (enc.length > k || new bn(enc).cmp(key.modulus) >= 0) { |
@@ -27194,13 +27194,13 @@ Script.prototype.runInContext = function (context) { | |||
27194 | if (!(context instanceof Context)) { | 27194 | if (!(context instanceof Context)) { |
27195 | throw new TypeError("needs a 'context' argument."); | 27195 | throw new TypeError("needs a 'context' argument."); |
27196 | } | 27196 | } |
27197 | 27197 | ||
27198 | var iframe = document.createElement('iframe'); | 27198 | var iframe = document.createElement('iframe'); |
27199 | if (!iframe.style) iframe.style = {}; | 27199 | if (!iframe.style) iframe.style = {}; |
27200 | iframe.style.display = 'none'; | 27200 | iframe.style.display = 'none'; |
27201 | 27201 | ||
27202 | document.body.appendChild(iframe); | 27202 | document.body.appendChild(iframe); |
27203 | 27203 | ||
27204 | var win = iframe.contentWindow; | 27204 | var win = iframe.contentWindow; |
27205 | var wEval = win.eval, wExecScript = win.execScript; | 27205 | var wEval = win.eval, wExecScript = win.execScript; |
27206 | 27206 | ||
@@ -27209,7 +27209,7 @@ Script.prototype.runInContext = function (context) { | |||
27209 | wExecScript.call(win, 'null'); | 27209 | wExecScript.call(win, 'null'); |
27210 | wEval = win.eval; | 27210 | wEval = win.eval; |
27211 | } | 27211 | } |
27212 | 27212 | ||
27213 | forEach(Object_keys(context), function (key) { | 27213 | forEach(Object_keys(context), function (key) { |
27214 | win[key] = context[key]; | 27214 | win[key] = context[key]; |
27215 | }); | 27215 | }); |
@@ -27218,11 +27218,11 @@ Script.prototype.runInContext = function (context) { | |||
27218 | win[key] = context[key]; | 27218 | win[key] = context[key]; |
27219 | } | 27219 | } |
27220 | }); | 27220 | }); |
27221 | 27221 | ||
27222 | var winKeys = Object_keys(win); | 27222 | var winKeys = Object_keys(win); |
27223 | 27223 | ||
27224 | var res = wEval.call(win, this.code); | 27224 | var res = wEval.call(win, this.code); |
27225 | 27225 | ||
27226 | forEach(Object_keys(win), function (key) { | 27226 | forEach(Object_keys(win), function (key) { |
27227 | // Avoid copying circular objects like `top` and `window` by only | 27227 | // Avoid copying circular objects like `top` and `window` by only |
27228 | // updating existing context properties or new properties in the `win` | 27228 | // updating existing context properties or new properties in the `win` |
@@ -27237,9 +27237,9 @@ Script.prototype.runInContext = function (context) { | |||
27237 | defineProp(context, key, win[key]); | 27237 | defineProp(context, key, win[key]); |
27238 | } | 27238 | } |
27239 | }); | 27239 | }); |
27240 | 27240 | ||
27241 | document.body.removeChild(iframe); | 27241 | document.body.removeChild(iframe); |
27242 | 27242 | ||
27243 | return res; | 27243 | return res; |
27244 | }; | 27244 | }; |
27245 | 27245 | ||
diff --git a/src/js/ripple-util.js b/src/js/ripple-util.js index 8184a76..f26a93a 100644 --- a/src/js/ripple-util.js +++ b/src/js/ripple-util.js | |||
@@ -6,5 +6,5 @@ function convertRippleAdrr(address) { | |||
6 | 6 | ||
7 | function convertRipplePriv(priv) { | 7 | function convertRipplePriv(priv) { |
8 | return window.basex('123456789ABCDEFGHJKLMNPQRSTUVWXYZabcdefghijkmnopqrstuvwxyz').decode(priv).toString("hex").slice(2,66) | 8 | return window.basex('123456789ABCDEFGHJKLMNPQRSTUVWXYZabcdefghijkmnopqrstuvwxyz').decode(priv).toString("hex").slice(2,66) |
9 | } | 9 | } |
10 | 10 | ||
diff --git a/src/js/segwit-parameters.js b/src/js/segwit-parameters.js index aab7df0..2f729f8 100644 --- a/src/js/segwit-parameters.js +++ b/src/js/segwit-parameters.js | |||
@@ -173,7 +173,7 @@ bitcoinjs.bitcoin.networks.digibyte.p2wpkh = { | |||
173 | }; | 173 | }; |
174 | 174 | ||
175 | bitcoinjs.bitcoin.networks.digibyte.p2wpkhInP2sh = { | 175 | bitcoinjs.bitcoin.networks.digibyte.p2wpkhInP2sh = { |
176 | baseNetwork: "digibyte", | 176 | baseNetwork: "digibyte", |
177 | messagePrefix: '\x19DigiByte Signed Message:\n', | 177 | messagePrefix: '\x19DigiByte Signed Message:\n', |
178 | bech32: 'dgb', | 178 | bech32: 'dgb', |
179 | bip32: { | 179 | bip32: { |
@@ -199,7 +199,7 @@ bitcoinjs.bitcoin.networks.blockstamp.p2wpkh = { | |||
199 | }; | 199 | }; |
200 | 200 | ||
201 | bitcoinjs.bitcoin.networks.blockstamp.p2wpkhInP2sh = { | 201 | bitcoinjs.bitcoin.networks.blockstamp.p2wpkhInP2sh = { |
202 | baseNetwork: "blockstamp", | 202 | baseNetwork: "blockstamp", |
203 | messagePrefix: '\x18BlockStamp Signed Message:\n', | 203 | messagePrefix: '\x18BlockStamp Signed Message:\n', |
204 | bech32: 'bc', | 204 | bech32: 'bc', |
205 | bip32: { | 205 | bip32: { |
@@ -225,7 +225,7 @@ bitcoinjs.bitcoin.networks.nix.p2wpkh = { | |||
225 | }; | 225 | }; |
226 | 226 | ||
227 | bitcoinjs.bitcoin.networks.nix.p2wpkhInP2sh = { | 227 | bitcoinjs.bitcoin.networks.nix.p2wpkhInP2sh = { |
228 | baseNetwork: "nix", | 228 | baseNetwork: "nix", |
229 | messagePrefix: '\x18Nix Signed Message:\n', | 229 | messagePrefix: '\x18Nix Signed Message:\n', |
230 | bech32: 'nix', | 230 | bech32: 'nix', |
231 | bip32: { | 231 | bip32: { |
diff --git a/src/js/sjcl-bip39.js b/src/js/sjcl-bip39.js index 537e3b8..447b565 100644 --- a/src/js/sjcl-bip39.js +++ b/src/js/sjcl-bip39.js | |||
@@ -26,13 +26,13 @@ var sjcl = { | |||
26 | 26 | ||
27 | /** @namespace Key exchange functions. Right now only SRP is implemented. */ | 27 | /** @namespace Key exchange functions. Right now only SRP is implemented. */ |
28 | keyexchange: {}, | 28 | keyexchange: {}, |
29 | 29 | ||
30 | /** @namespace Block cipher modes of operation. */ | 30 | /** @namespace Block cipher modes of operation. */ |
31 | mode: {}, | 31 | mode: {}, |
32 | 32 | ||
33 | /** @namespace Miscellaneous. HMAC and PBKDF2. */ | 33 | /** @namespace Miscellaneous. HMAC and PBKDF2. */ |
34 | misc: {}, | 34 | misc: {}, |
35 | 35 | ||
36 | /** | 36 | /** |
37 | * @namespace Bit array encoders and decoders. | 37 | * @namespace Bit array encoders and decoders. |
38 | * | 38 | * |
@@ -43,7 +43,7 @@ var sjcl = { | |||
43 | * the method names are "fromBits" and "toBits". | 43 | * the method names are "fromBits" and "toBits". |
44 | */ | 44 | */ |
45 | codec: {}, | 45 | codec: {}, |
46 | 46 | ||
47 | /** @namespace Exceptions. */ | 47 | /** @namespace Exceptions. */ |
48 | exception: { | 48 | exception: { |
49 | /** @constructor Ciphertext is corrupt. */ | 49 | /** @constructor Ciphertext is corrupt. */ |
@@ -51,13 +51,13 @@ var sjcl = { | |||
51 | this.toString = function() { return "CORRUPT: "+this.message; }; | 51 | this.toString = function() { return "CORRUPT: "+this.message; }; |
52 | this.message = message; | 52 | this.message = message; |
53 | }, | 53 | }, |
54 | 54 | ||
55 | /** @constructor Invalid parameter. */ | 55 | /** @constructor Invalid parameter. */ |
56 | invalid: function(message) { | 56 | invalid: function(message) { |
57 | this.toString = function() { return "INVALID: "+this.message; }; | 57 | this.toString = function() { return "INVALID: "+this.message; }; |
58 | this.message = message; | 58 | this.message = message; |
59 | }, | 59 | }, |
60 | 60 | ||
61 | /** @constructor Bug or missing feature in SJCL. @constructor */ | 61 | /** @constructor Bug or missing feature in SJCL. @constructor */ |
62 | bug: function(message) { | 62 | bug: function(message) { |
63 | this.toString = function() { return "BUG: "+this.message; }; | 63 | this.toString = function() { return "BUG: "+this.message; }; |
@@ -159,7 +159,7 @@ sjcl.bitArray = { | |||
159 | if (a1.length === 0 || a2.length === 0) { | 159 | if (a1.length === 0 || a2.length === 0) { |
160 | return a1.concat(a2); | 160 | return a1.concat(a2); |
161 | } | 161 | } |
162 | 162 | ||
163 | var last = a1[a1.length-1], shift = sjcl.bitArray.getPartial(last); | 163 | var last = a1[a1.length-1], shift = sjcl.bitArray.getPartial(last); |
164 | if (shift === 32) { | 164 | if (shift === 32) { |
165 | return a1.concat(a2); | 165 | return a1.concat(a2); |
@@ -245,7 +245,7 @@ sjcl.bitArray = { | |||
245 | _shiftRight: function (a, shift, carry, out) { | 245 | _shiftRight: function (a, shift, carry, out) { |
246 | var i, last2=0, shift2; | 246 | var i, last2=0, shift2; |
247 | if (out === undefined) { out = []; } | 247 | if (out === undefined) { out = []; } |
248 | 248 | ||
249 | for (; shift >= 32; shift -= 32) { | 249 | for (; shift >= 32; shift -= 32) { |
250 | out.push(carry); | 250 | out.push(carry); |
251 | carry = 0; | 251 | carry = 0; |
@@ -253,7 +253,7 @@ sjcl.bitArray = { | |||
253 | if (shift === 0) { | 253 | if (shift === 0) { |
254 | return out.concat(a); | 254 | return out.concat(a); |
255 | } | 255 | } |
256 | 256 | ||
257 | for (i=0; i<a.length; i++) { | 257 | for (i=0; i<a.length; i++) { |
258 | out.push(carry | a[i]>>>shift); | 258 | out.push(carry | a[i]>>>shift); |
259 | carry = a[i] << (32-shift); | 259 | carry = a[i] << (32-shift); |
@@ -263,7 +263,7 @@ sjcl.bitArray = { | |||
263 | out.push(sjcl.bitArray.partial(shift+shift2 & 31, (shift + shift2 > 32) ? carry : out.pop(),1)); | 263 | out.push(sjcl.bitArray.partial(shift+shift2 & 31, (shift + shift2 > 32) ? carry : out.pop(),1)); |
264 | return out; | 264 | return out; |
265 | }, | 265 | }, |
266 | 266 | ||
267 | /** xor a block of 4 words together. | 267 | /** xor a block of 4 words together. |
268 | * @private | 268 | * @private |
269 | */ | 269 | */ |
@@ -295,7 +295,7 @@ sjcl.bitArray = { | |||
295 | * @author Mike Hamburg | 295 | * @author Mike Hamburg |
296 | * @author Dan Boneh | 296 | * @author Dan Boneh |
297 | */ | 297 | */ |
298 | 298 | ||
299 | /** @namespace UTF-8 strings */ | 299 | /** @namespace UTF-8 strings */ |
300 | sjcl.codec.utf8String = { | 300 | sjcl.codec.utf8String = { |
301 | /** Convert from a bitArray to a UTF-8 string. */ | 301 | /** Convert from a bitArray to a UTF-8 string. */ |
@@ -310,7 +310,7 @@ sjcl.codec.utf8String = { | |||
310 | } | 310 | } |
311 | return decodeURIComponent(escape(out)); | 311 | return decodeURIComponent(escape(out)); |
312 | }, | 312 | }, |
313 | 313 | ||
314 | /** Convert from a UTF-8 string to a bitArray. */ | 314 | /** Convert from a UTF-8 string to a bitArray. */ |
315 | toBits: function (str) { | 315 | toBits: function (str) { |
316 | str = unescape(encodeURIComponent(str)); | 316 | str = unescape(encodeURIComponent(str)); |
@@ -412,7 +412,7 @@ sjcl.hash.sha512.prototype = { | |||
412 | * @constant | 412 | * @constant |
413 | */ | 413 | */ |
414 | blockSize: 1024, | 414 | blockSize: 1024, |
415 | 415 | ||
416 | /** | 416 | /** |
417 | * Reset the hash state. | 417 | * Reset the hash state. |
418 | * @return this | 418 | * @return this |
@@ -423,7 +423,7 @@ sjcl.hash.sha512.prototype = { | |||
423 | this._length = 0; | 423 | this._length = 0; |
424 | return this; | 424 | return this; |
425 | }, | 425 | }, |
426 | 426 | ||
427 | /** | 427 | /** |
428 | * Input several words to the hash. | 428 | * Input several words to the hash. |
429 | * @param {bitArray|String} data the data to hash. | 429 | * @param {bitArray|String} data the data to hash. |
@@ -441,7 +441,7 @@ sjcl.hash.sha512.prototype = { | |||
441 | } | 441 | } |
442 | return this; | 442 | return this; |
443 | }, | 443 | }, |
444 | 444 | ||
445 | /** | 445 | /** |
446 | * Complete hashing and output the hash value. | 446 | * Complete hashing and output the hash value. |
447 | * @return {bitArray} The hash value, an array of 16 big-endian words. | 447 | * @return {bitArray} The hash value, an array of 16 big-endian words. |
@@ -736,12 +736,12 @@ sjcl.misc.hmac = function (key, Hash) { | |||
736 | if (key.length > bs) { | 736 | if (key.length > bs) { |
737 | key = Hash.hash(key); | 737 | key = Hash.hash(key); |
738 | } | 738 | } |
739 | 739 | ||
740 | for (i=0; i<bs; i++) { | 740 | for (i=0; i<bs; i++) { |
741 | exKey[0][i] = key[i]^0x36363636; | 741 | exKey[0][i] = key[i]^0x36363636; |
742 | exKey[1][i] = key[i]^0x5C5C5C5C; | 742 | exKey[1][i] = key[i]^0x5C5C5C5C; |
743 | } | 743 | } |
744 | 744 | ||
745 | this._baseHash[0].update(exKey[0]); | 745 | this._baseHash[0].update(exKey[0]); |
746 | this._baseHash[1].update(exKey[1]); | 746 | this._baseHash[1].update(exKey[1]); |
747 | this._resultHash = new Hash(this._baseHash[0]); | 747 | this._resultHash = new Hash(this._baseHash[0]); |
@@ -804,34 +804,34 @@ sjcl.misc.hmac.prototype.digest = function () { | |||
804 | */ | 804 | */ |
805 | sjcl.misc.pbkdf2 = function (password, salt, count, length, Prff) { | 805 | sjcl.misc.pbkdf2 = function (password, salt, count, length, Prff) { |
806 | count = count || 1000; | 806 | count = count || 1000; |
807 | 807 | ||
808 | if (length < 0 || count < 0) { | 808 | if (length < 0 || count < 0) { |
809 | throw sjcl.exception.invalid("invalid params to pbkdf2"); | 809 | throw sjcl.exception.invalid("invalid params to pbkdf2"); |
810 | } | 810 | } |
811 | 811 | ||
812 | if (typeof password === "string") { | 812 | if (typeof password === "string") { |
813 | password = sjcl.codec.utf8String.toBits(password); | 813 | password = sjcl.codec.utf8String.toBits(password); |
814 | } | 814 | } |
815 | 815 | ||
816 | if (typeof salt === "string") { | 816 | if (typeof salt === "string") { |
817 | salt = sjcl.codec.utf8String.toBits(salt); | 817 | salt = sjcl.codec.utf8String.toBits(salt); |
818 | } | 818 | } |
819 | 819 | ||
820 | Prff = Prff || sjcl.misc.hmac; | 820 | Prff = Prff || sjcl.misc.hmac; |
821 | 821 | ||
822 | var prf = new Prff(password), | 822 | var prf = new Prff(password), |
823 | u, ui, i, j, k, out = [], b = sjcl.bitArray; | 823 | u, ui, i, j, k, out = [], b = sjcl.bitArray; |
824 | 824 | ||
825 | for (k = 1; 32 * out.length < (length || 1); k++) { | 825 | for (k = 1; 32 * out.length < (length || 1); k++) { |
826 | u = ui = prf.encrypt(b.concat(salt,[k])); | 826 | u = ui = prf.encrypt(b.concat(salt,[k])); |
827 | 827 | ||
828 | for (i=1; i<count; i++) { | 828 | for (i=1; i<count; i++) { |
829 | ui = prf.encrypt(ui); | 829 | ui = prf.encrypt(ui); |
830 | for (j=0; j<ui.length; j++) { | 830 | for (j=0; j<ui.length; j++) { |
831 | u[j] ^= ui[j]; | 831 | u[j] ^= ui[j]; |
832 | } | 832 | } |
833 | } | 833 | } |
834 | 834 | ||
835 | out = out.concat(u); | 835 | out = out.concat(u); |
836 | } | 836 | } |
837 | 837 | ||
@@ -890,7 +890,7 @@ sjcl.hash.sha256.prototype = { | |||
890 | * @constant | 890 | * @constant |
891 | */ | 891 | */ |
892 | blockSize: 512, | 892 | blockSize: 512, |
893 | 893 | ||
894 | /** | 894 | /** |
895 | * Reset the hash state. | 895 | * Reset the hash state. |
896 | * @return this | 896 | * @return this |
@@ -901,7 +901,7 @@ sjcl.hash.sha256.prototype = { | |||
901 | this._length = 0; | 901 | this._length = 0; |
902 | return this; | 902 | return this; |
903 | }, | 903 | }, |
904 | 904 | ||
905 | /** | 905 | /** |
906 | * Input several words to the hash. | 906 | * Input several words to the hash. |
907 | * @param {bitArray|String} data the data to hash. | 907 | * @param {bitArray|String} data the data to hash. |
@@ -919,7 +919,7 @@ sjcl.hash.sha256.prototype = { | |||
919 | } | 919 | } |
920 | return this; | 920 | return this; |
921 | }, | 921 | }, |
922 | 922 | ||
923 | /** | 923 | /** |
924 | * Complete hashing and output the hash value. | 924 | * Complete hashing and output the hash value. |
925 | * @return {bitArray} The hash value, an array of 8 big-endian words. | 925 | * @return {bitArray} The hash value, an array of 8 big-endian words. |
@@ -929,12 +929,12 @@ sjcl.hash.sha256.prototype = { | |||
929 | 929 | ||
930 | // Round out and push the buffer | 930 | // Round out and push the buffer |
931 | b = sjcl.bitArray.concat(b, [sjcl.bitArray.partial(1,1)]); | 931 | b = sjcl.bitArray.concat(b, [sjcl.bitArray.partial(1,1)]); |
932 | 932 | ||
933 | // Round out the buffer to a multiple of 16 words, less the 2 length words. | 933 | // Round out the buffer to a multiple of 16 words, less the 2 length words. |
934 | for (i = b.length + 2; i & 15; i++) { | 934 | for (i = b.length + 2; i & 15; i++) { |
935 | b.push(0); | 935 | b.push(0); |
936 | } | 936 | } |
937 | 937 | ||
938 | // append the length | 938 | // append the length |
939 | b.push(Math.floor(this._length / 0x100000000)); | 939 | b.push(Math.floor(this._length / 0x100000000)); |
940 | b.push(this._length | 0); | 940 | b.push(this._length | 0); |
@@ -955,7 +955,7 @@ sjcl.hash.sha256.prototype = { | |||
955 | /* | 955 | /* |
956 | _init:[0x6a09e667,0xbb67ae85,0x3c6ef372,0xa54ff53a,0x510e527f,0x9b05688c,0x1f83d9ab,0x5be0cd19], | 956 | _init:[0x6a09e667,0xbb67ae85,0x3c6ef372,0xa54ff53a,0x510e527f,0x9b05688c,0x1f83d9ab,0x5be0cd19], |
957 | */ | 957 | */ |
958 | 958 | ||
959 | /** | 959 | /** |
960 | * The SHA-256 hash key, to be precomputed. | 960 | * The SHA-256 hash key, to be precomputed. |
961 | * @private | 961 | * @private |
@@ -990,7 +990,7 @@ sjcl.hash.sha256.prototype = { | |||
990 | continue outer; | 990 | continue outer; |
991 | } | 991 | } |
992 | } | 992 | } |
993 | 993 | ||
994 | if (i<8) { | 994 | if (i<8) { |
995 | this._init[i] = frac(Math.pow(prime, 1/2)); | 995 | this._init[i] = frac(Math.pow(prime, 1/2)); |
996 | } | 996 | } |
@@ -998,13 +998,13 @@ sjcl.hash.sha256.prototype = { | |||
998 | i++; | 998 | i++; |
999 | } | 999 | } |
1000 | }, | 1000 | }, |
1001 | 1001 | ||
1002 | /** | 1002 | /** |
1003 | * Perform one cycle of SHA-256. | 1003 | * Perform one cycle of SHA-256. |
1004 | * @param {bitArray} words one block of words. | 1004 | * @param {bitArray} words one block of words. |
1005 | * @private | 1005 | * @private |
1006 | */ | 1006 | */ |
1007 | _block:function (words) { | 1007 | _block:function (words) { |
1008 | var i, tmp, a, b, | 1008 | var i, tmp, a, b, |
1009 | w = words.slice(0), | 1009 | w = words.slice(0), |
1010 | h = this._h, | 1010 | h = this._h, |
@@ -1032,13 +1032,13 @@ sjcl.hash.sha256.prototype = { | |||
1032 | } else { | 1032 | } else { |
1033 | a = w[(i+1 ) & 15]; | 1033 | a = w[(i+1 ) & 15]; |
1034 | b = w[(i+14) & 15]; | 1034 | b = w[(i+14) & 15]; |
1035 | tmp = w[i&15] = ((a>>>7 ^ a>>>18 ^ a>>>3 ^ a<<25 ^ a<<14) + | 1035 | tmp = w[i&15] = ((a>>>7 ^ a>>>18 ^ a>>>3 ^ a<<25 ^ a<<14) + |
1036 | (b>>>17 ^ b>>>19 ^ b>>>10 ^ b<<15 ^ b<<13) + | 1036 | (b>>>17 ^ b>>>19 ^ b>>>10 ^ b<<15 ^ b<<13) + |
1037 | w[i&15] + w[(i+9) & 15]) | 0; | 1037 | w[i&15] + w[(i+9) & 15]) | 0; |
1038 | } | 1038 | } |
1039 | 1039 | ||
1040 | tmp = (tmp + h7 + (h4>>>6 ^ h4>>>11 ^ h4>>>25 ^ h4<<26 ^ h4<<21 ^ h4<<7) + (h6 ^ h4&(h5^h6)) + k[i]); // | 0; | 1040 | tmp = (tmp + h7 + (h4>>>6 ^ h4>>>11 ^ h4>>>25 ^ h4<<26 ^ h4<<21 ^ h4<<7) + (h6 ^ h4&(h5^h6)) + k[i]); // | 0; |
1041 | 1041 | ||
1042 | // shift register | 1042 | // shift register |
1043 | h7 = h6; h6 = h5; h5 = h4; | 1043 | h7 = h6; h6 = h5; h5 = h4; |
1044 | h4 = h3 + tmp | 0; | 1044 | h4 = h3 + tmp | 0; |
diff --git a/src/js/stellar-util.js b/src/js/stellar-util.js index 8722fbf..d576a36 100644 --- a/src/js/stellar-util.js +++ b/src/js/stellar-util.js | |||
@@ -13146,7 +13146,7 @@ Cursor.prototype.fill = function(value, length) | |||
13146 | { | 13146 | { |
13147 | length = this.buffer().length - this.tell(); | 13147 | length = this.buffer().length - this.tell(); |
13148 | } | 13148 | } |
13149 | 13149 | ||
13150 | this.buffer().fill(value, this.tell(), this.tell() + length); | 13150 | this.buffer().fill(value, this.tell(), this.tell() + length); |
13151 | this.seek('+', length); | 13151 | this.seek('+', length); |
13152 | 13152 | ||
@@ -42404,13 +42404,13 @@ Script.prototype.runInContext = function (context) { | |||
42404 | if (!(context instanceof Context)) { | 42404 | if (!(context instanceof Context)) { |
42405 | throw new TypeError("needs a 'context' argument."); | 42405 | throw new TypeError("needs a 'context' argument."); |
42406 | } | 42406 | } |
42407 | 42407 | ||
42408 | var iframe = document.createElement('iframe'); | 42408 | var iframe = document.createElement('iframe'); |
42409 | if (!iframe.style) iframe.style = {}; | 42409 | if (!iframe.style) iframe.style = {}; |
42410 | iframe.style.display = 'none'; | 42410 | iframe.style.display = 'none'; |
42411 | 42411 | ||
42412 | document.body.appendChild(iframe); | 42412 | document.body.appendChild(iframe); |
42413 | 42413 | ||
42414 | var win = iframe.contentWindow; | 42414 | var win = iframe.contentWindow; |
42415 | var wEval = win.eval, wExecScript = win.execScript; | 42415 | var wEval = win.eval, wExecScript = win.execScript; |
42416 | 42416 | ||
@@ -42419,7 +42419,7 @@ Script.prototype.runInContext = function (context) { | |||
42419 | wExecScript.call(win, 'null'); | 42419 | wExecScript.call(win, 'null'); |
42420 | wEval = win.eval; | 42420 | wEval = win.eval; |
42421 | } | 42421 | } |
42422 | 42422 | ||
42423 | forEach(Object_keys(context), function (key) { | 42423 | forEach(Object_keys(context), function (key) { |
42424 | win[key] = context[key]; | 42424 | win[key] = context[key]; |
42425 | }); | 42425 | }); |
@@ -42428,11 +42428,11 @@ Script.prototype.runInContext = function (context) { | |||
42428 | win[key] = context[key]; | 42428 | win[key] = context[key]; |
42429 | } | 42429 | } |
42430 | }); | 42430 | }); |
42431 | 42431 | ||
42432 | var winKeys = Object_keys(win); | 42432 | var winKeys = Object_keys(win); |
42433 | 42433 | ||
42434 | var res = wEval.call(win, this.code); | 42434 | var res = wEval.call(win, this.code); |
42435 | 42435 | ||
42436 | forEach(Object_keys(win), function (key) { | 42436 | forEach(Object_keys(win), function (key) { |
42437 | // Avoid copying circular objects like `top` and `window` by only | 42437 | // Avoid copying circular objects like `top` and `window` by only |
42438 | // updating existing context properties or new properties in the `win` | 42438 | // updating existing context properties or new properties in the `win` |
@@ -42447,9 +42447,9 @@ Script.prototype.runInContext = function (context) { | |||
42447 | defineProp(context, key, win[key]); | 42447 | defineProp(context, key, win[key]); |
42448 | } | 42448 | } |
42449 | }); | 42449 | }); |
42450 | 42450 | ||
42451 | document.body.removeChild(iframe); | 42451 | document.body.removeChild(iframe); |
42452 | 42452 | ||
42453 | return res; | 42453 | return res; |
42454 | }; | 42454 | }; |
42455 | 42455 | ||