aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKaz Kylheku <kaz@kylheku.com>2022-10-24 19:35:50 -0700
committerKaz Kylheku <kaz@kylheku.com>2022-10-24 19:35:50 -0700
commitc0f67b215f7f989fa3ca888f0a3ad2446d1548be (patch)
treea3a8bfb55665fcee69612364a5adb9fe1b0244b3
parent47f82008434777eec7b2707563b087483aa78fd6 (diff)
downloadjp-hash-c0f67b215f7f989fa3ca888f0a3ad2446d1548be.tar.gz
jp-hash-c0f67b215f7f989fa3ca888f0a3ad2446d1548be.tar.bz2
jp-hash-c0f67b215f7f989fa3ca888f0a3ad2446d1548be.zip
firefox: convert to built-in async SHA256.
* firefox/jp-hash.js (jp_hash): Renamed to async function jp_hash_complete which receives digest as an argument. (jp_hash_start): New async function: initiates SHA256 async operation, returning promise. (jp_hash_sha256): Andrea Griffini's portable synchronous implementation removed. (jphash): New async function: stages the two steps of the hash, and then invokes the continuation. (jp_hash_edit): Switch to async. Assignment of new value is done in continuation.
-rw-r--r--firefox/jp-hash.js116
1 files changed, 11 insertions, 105 deletions
diff --git a/firefox/jp-hash.js b/firefox/jp-hash.js
index bf989b3..1072b4b 100644
--- a/firefox/jp-hash.js
+++ b/firefox/jp-hash.js
@@ -46,9 +46,8 @@ const symbol = [
"^", "&", "*", "?", "/"
];
-function jp_hash(input)
+async function jp_hash_complete(hash)
{
- const hash = jp_hash_sha256(input);
const view = new DataView(hash);
let word = [];
let ms = [];
@@ -84,116 +83,23 @@ function jp_hash(input)
}
}
+async function jp_hash_start(message) {
+ const encoder = new TextEncoder();
+ const data = encoder.encode(message);
+ const hash = await crypto.subtle.digest('SHA-256', data);
+ return hash;
+}
-// Copyright 2022 Andrea Griffini
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-function jp_hash_sha256(data)
+async function jphash(message, cont)
{
- let h0 = 0x6a09e667, h1 = 0xbb67ae85, h2 = 0x3c6ef372, h3 = 0xa54ff53a;
- let h4 = 0x510e527f, h5 = 0x9b05688c, h6 = 0x1f83d9ab, h7 = 0x5be0cd19;
- let tsz = 0, bp = 0;
- const k = [
- 0x428a2f98, 0x71374491, 0xb5c0fbcf, 0xe9b5dba5, 0x3956c25b, 0x59f111f1, 0x923f82a4, 0xab1c5ed5,
- 0xd807aa98, 0x12835b01, 0x243185be, 0x550c7dc3, 0x72be5d74, 0x80deb1fe, 0x9bdc06a7, 0xc19bf174,
- 0xe49b69c1, 0xefbe4786, 0x0fc19dc6, 0x240ca1cc, 0x2de92c6f, 0x4a7484aa, 0x5cb0a9dc, 0x76f988da,
- 0x983e5152, 0xa831c66d, 0xb00327c8, 0xbf597fc7, 0xc6e00bf3, 0xd5a79147, 0x06ca6351, 0x14292967,
- 0x27b70a85, 0x2e1b2138, 0x4d2c6dfc, 0x53380d13, 0x650a7354, 0x766a0abb, 0x81c2c92e, 0x92722c85,
- 0xa2bfe8a1, 0xa81a664b, 0xc24b8b70, 0xc76c51a3, 0xd192e819, 0xd6990624, 0xf40e3585, 0x106aa070,
- 0x19a4c116, 0x1e376c08, 0x2748774c, 0x34b0bcb5, 0x391c0cb3, 0x4ed8aa4a, 0x5b9cca4f, 0x682e6ff3,
- 0x748f82ee, 0x78a5636f, 0x84c87814, 0x8cc70208, 0x90befffa, 0xa4506ceb, 0xbef9a3f7, 0xc67178f2
- ];
- const rrot = (x, n) => (x >>> n) | (x << (32-n));
- const w = new Uint32Array(64);
- const buf = new Uint8Array(64);
- const process = () => {
- for (let j=0,r=0; j<16; j++,r+=4) {
- w[j] = (buf[r]<<24) | (buf[r+1]<<16) | (buf[r+2]<<8) | buf[r+3];
- }
- for (let j=16; j<64; j++) {
- let s0 = rrot(w[j-15], 7) ^ rrot(w[j-15], 18) ^ (w[j-15] >>> 3);
- let s1 = rrot(w[j-2], 17) ^ rrot(w[j-2], 19) ^ (w[j-2] >>> 10);
- w[j] = (w[j-16] + s0 + w[j-7] + s1) | 0;
- }
- let a = h0, b = h1, c = h2, d = h3, e = h4, f = h5, g = h6, h = h7;
- for (let j=0; j<64; j++) {
- let S1 = rrot(e, 6) ^ rrot(e, 11) ^ rrot(e, 25);
- let ch = (e & f) ^ ((~e) & g);
- let t1 = (h + S1 + ch + k[j] + w[j]) | 0;
- let S0 = rrot(a, 2) ^ rrot(a, 13) ^ rrot(a, 22);
- let maj = (a & b) ^ (a & c) ^ (b & c);
- let t2 = (S0 + maj) | 0;
- h = g; g = f; f = e; e = (d + t1)|0; d = c; c = b; b = a; a = (t1 + t2)|0;
- }
- h0 = (h0 + a)|0; h1 = (h1 + b)|0; h2 = (h2 + c)|0; h3 = (h3 + d)|0;
- h4 = (h4 + e)|0; h5 = (h5 + f)|0; h6 = (h6 + g)|0; h7 = (h7 + h)|0;
- bp = 0;
- };
- const add = data => {
- if (typeof data === "string") {
- data = (new TextEncoder).encode(data);
- }
- for (let i=0; i<data.length; i++) {
- buf[bp++] = data[i];
- if (bp === 64) process();
- }
- tsz += data.length;
- };
- const digest = () => {
- buf[bp++] = 0x80; if (bp == 64) process();
- if (bp + 8 > 64) {
- while (bp < 64) buf[bp++] = 0x00;
- process();
- }
- while (bp < 58) buf[bp++] = 0x00;
- // Max number of bytes is 35,184,372,088,831
- let L = tsz * 8;
- buf[bp++] = (L / 1099511627776.) & 255;
- buf[bp++] = (L / 4294967296.) & 255;
- buf[bp++] = L >>> 24;
- buf[bp++] = (L >>> 16) & 255;
- buf[bp++] = (L >>> 8) & 255;
- buf[bp++] = L & 255;
- process();
- let result = new ArrayBuffer(32);
- let byte = new Uint8Array(result);
- byte[ 0] = h0 >>> 24; byte[ 1] = (h0 >>> 16) & 255; byte[ 2] = (h0 >>> 8) & 255; byte[ 3] = h0 & 255;
- byte[ 4] = h1 >>> 24; byte[ 5] = (h1 >>> 16) & 255; byte[ 6] = (h1 >>> 8) & 255; byte[ 7] = h1 & 255;
- byte[ 8] = h2 >>> 24; byte[ 9] = (h2 >>> 16) & 255; byte[10] = (h2 >>> 8) & 255; byte[11] = h2 & 255;
- byte[12] = h3 >>> 24; byte[13] = (h3 >>> 16) & 255; byte[14] = (h3 >>> 8) & 255; byte[15] = h3 & 255;
- byte[16] = h4 >>> 24; byte[17] = (h4 >>> 16) & 255; byte[18] = (h4 >>> 8) & 255; byte[19] = h4 & 255;
- byte[20] = h5 >>> 24; byte[21] = (h5 >>> 16) & 255; byte[22] = (h5 >>> 8) & 255; byte[23] = h5 & 255;
- byte[24] = h6 >>> 24; byte[25] = (h6 >>> 16) & 255; byte[26] = (h6 >>> 8) & 255; byte[27] = h6 & 255;
- byte[28] = h7 >>> 24; byte[29] = (h7 >>> 16) & 255; byte[30] = (h7 >>> 8) & 255; byte[31] = h7 & 255;
- return result;
- };
- if (data === undefined)
- return {add, digest};
- add(data);
- return digest();
+ jp_hash_start(message).then(jp_hash_complete).then(cont);
}
-function jp_hash_edit(elem)
+async function jp_hash_edit(elem)
{
if (elem.nodeType == 1 &&
(elem.nodeName == "INPUT" || elem.nodeName == "TEXTAREA"))
{
- elem.value = jp_hash(elem.value);
+ jphash(elem.value, (jph) => { elem.value = jph; });
}
}