tinyhmacmd5 0.0.4 → 0.0.6

package/README.md

@@ -2,7 +2,9 @@
 
 A tiny JavaScript HMAC-MD5 implementation.
 
-The minified browser bundle ([`browser.min.js`](browser.min.js)) is only 1160 bytes.
+The minified browser bundle ([`browser.min.js`](browser.min.js)) is only 965 bytes.
+
+Preview: https://bddjr.github.io/tinyhmacmd5/
 
 ## Setup
 

package/browser.min.js

@@ -1,2 +1,2 @@
-/** @license https://github.com/bddjr/tinyhmacmd5/blob/HEAD/LICENSE */
-{let r="length",e=16,n=2**32,t=Array,o=Math,a=o.floor,f=[(r,e,n)=>r&e|~r&n,(r,e,n)=>r&n|e&~n,(r,e,n)=>r^e^n,(r,e,n)=>e^(r|~n)],u=t(64),i=(i,l)=>{var d,s,v,c,g,h,y,w,A=0,b=1732584193,m=271733878,p=~b,x=~m,E=a((l+64)/512)*e+14,M=t(e),S=(r,e,t,a)=>0|((y=e+r+(y=E++*(7&3817>>3*h)+(7&328>>3*h)&15,h?M[y]:M[y]=0|i[A++])+(u[g++]??=0|n*o.abs(o.sin(g))))<<a|y>>>32-a)+t,T=(r,n,t,o)=>{for(w=f[h],E=0;E<e;)b=S(w(x,p,m),b,x,r),m=S(w(b,x,p),m,b,n),p=S(w(m,b,x),p,m,t),x=S(w(p,m,b),x,p,o);h++};for(i[a(l/32)]|=128<<l%32,i[E]=0|l,i[E+1]=0|l/n;A<i[r];m=0|m+c)d=b,s=x,v=p,c=m,g=h=0,T(7,12,17,22),T(5,9,14,20),T(4,11,e,23),T(6,10,15,21),b=0|b+d,x=0|x+s,p=0|p+v;return[b,x,p,m]},l=e=>{for(var n=e[r],t=[];n;)t[a(--n/4)]|=e[n]<<n%4*8;return t},d=r=>"string"==typeof r?(new TextEncoder).encode(r):r;var md5=(n,o,a)=>{var f,u=l(n=d(n)),s=8*n[r],v=e,c=new Uint8Array(e),g=r=>{for(u.unshift(...t(e));v;)u[--v]=r^f[v];v=e};for(null!=o&&((f=l(o=d(o)))[r]>e&&(f=i(f,8*o[r])),g(909522486),u=i(u,512+s),g(1549556828),s=640),u=i(u,s);v;)c[--v]=u[v>>2]>>>v%4*8;return a?c:c.reduce((r,n)=>r+(n>>4&&"")+n.toString(e),"")}}
+/** @license https://bddjr.github.io/tinyhmacmd5/lic */
+{let r=1732584193,e=271733878,t=~r,n=~e,o=[],f=(f,a,h=0,i,l,u,d,c,g=[r,n,t,e],s=[...g],y=r=>g[3&++c])=>{for(f[a+64>>>9<<4|14]=0|a,f[a>>>5]|=128<<a%32;h<f.length;h+=16){for(c=i=0;i<64;c-=6)g[3&c]=0|((l=0|(l=y(),u=y(),d=y(),((a=i>>4<<2)?a>4?a>8?u^(l|~d):l^u^d:l&d|u&~d:l&u|~l&d)+(0|f[h+(i*(29521>>a)+(1296>>a)&15)])+(u="',16%).4$+07&*/5".charCodeAt(a+i%4)-32,o[63-i++]??=0|2**32*Math.abs(Math.sin(i)))+y()))<<u|l>>>32-u)+y();for(c=4;c;)s[--c]=g[c]=0|s[c]+g[c]}return g},a=(r,e,t=("string"==typeof r?r=(new TextEncoder).encode(r):r).length,n=[],o=8*t)=>{for(;t;)n[e+(--t>>>2)]|=r[t]<<t%4*8;return[n,o]};var md5=(r,e,t)=>{var n=16,o=null!=e,[h,i]=a(r,o*n),l=new Uint8Array(n);if(o){let[r,t]=a(e,0),o=e=>{for(;n;)h[--n]=16843009*e^r[n];n=16};t>512&&(r=f(r,t)),o(54),(h=f(h,512+i)).unshift(...Array(16)),o(92),i=640}for(h=f(h,i);n;)l[--n]=h[n>>2]>>>n%4*8;return t?l:l.reduce((r,e)=>r+(e>>4&&"")+e.toString(16),"")}}

package/main.js

@@ -1,152 +1,111 @@
-/** @license https://github.com/bddjr/tinyhmacmd5/blob/HEAD/LICENSE */
+/** @license https://bddjr.github.io/tinyhmacmd5/lic */
 
 // Adapted from https://github.com/blueimp/JavaScript-MD5
 
-/** @type {"length"} */
-let $length = "length"
-
-/** @type {16} */
-let $16 = 16
-
-let $2_32 = 2 ** 32
-
-let $Array = Array
-
-let $Math = Math
-
-let floor = $Math.floor
-
-/** @type {((b:number, c:number, d:number) => number)[]} */
-let ff = [
-  (b, c, d) => b & c | ~b & d,
-  (b, c, d) => b & d | c & ~d,
-  (b, c, d) => b ^ c ^ d,
-  (b, c, d) => c ^ (b | ~d)
-]
+let A = 1732584193
+  , D = 271733878
+  , C = ~A
+  , B = ~D
 
 /** @type {number[]} MD5 constants cached in memory */
-let K = $Array(64)
+let K = []
 
 /**
  * Calculate the MD5 of an array of little-endian words, and a bit length.
  *
  * @param {number[]} x Array of little-endian words
- * @param {number} bitLen Bit length
- * @returns {[number, number, number, number]} MD5 Array
+ * @param {number} l Bit length
+ * 
+ * @param {number} [j]
+ * @param {number} [t0]
+ * @param {number} [t1]
+ * @param {number} [t2]
+ * @param {number} [oi]
+ * 
+ * @returns {number[]} MD5 Array
  */
-let binlMD5 = (x, bitLen) => {
-  var i = 0
-    , olda
-    , oldb
-    , oldc
-    , oldd
-    , a = 1732584193
-    , d = 271733878
-    , c = ~a
-    , b = ~d
-    , j = floor((bitLen + 64) / 512) * $16 + 14
-
-  /** @type {number} */
-  var k_i
-
-  /** @type {number} */
-  var ff_i
-
-  /** @type {number} */
-  var cmn_t
-
-  /** @type {number[]} */
-  var w = $Array($16)
-
-  /**
-  * @param {number} q
-  * @param {number} a
-  * @param {number} b
-  * @param {number} s
-  * @returns {number}
-  */
-  var cmn = (q, a, b, s) => (
-    cmn_t = (
-      a + q +
-      (
-        cmn_t = j++ * (7 & 0o7351 >> ff_i * 3) + (7 & 0o0510 >> ff_i * 3) & 15,
-        ff_i ? w[cmn_t] : w[cmn_t] = 0 | x[i++]
-      ) +
-      (K[k_i++] ??= 0 | $2_32 * $Math.abs($Math.sin(k_i)))
-    ),
-    0 | (cmn_t << s | cmn_t >>> 32 - s) + b
-  )
-
-  /** @type {typeof ff[0]} */
-  var F_f
-
-  /**
-   * @param {number} s0
-   * @param {number} s1
-   * @param {number} s2
-   * @param {number} s3
-   */
-  var F = (s0, s1, s2, s3) => {
-    for (F_f = ff[ff_i], j = 0; j < $16;) {
-      a = cmn(F_f(b, c, d), a, b, s0)
-      d = cmn(F_f(a, b, c), d, a, s1)
-      c = cmn(F_f(d, a, b), c, d, s2)
-      b = cmn(F_f(c, d, a), b, c, s3)
-    }
-    ff_i++
-  }
+let binlMD5 = (
+  x,
+  l,
+  // var:
+  i = 0,
+  j,
+  t0,
+  t1,
+  t2,
+  oi,
+  output = [A, B, C, D],
+  oldOutput = [...output],
+  o = (/**@type {*}*/ _) => output[++oi & 3],
+) => {
 
   // append padding
-  x[floor(bitLen / 32)] |= 0x80 << bitLen % 32;
-  x[j] = 0 | bitLen;
-  x[j + 1] = 0 | bitLen / $2_32;
-
-  for (; i < x[$length]; d = 0 | d + oldd) {
-    olda = a
-    oldb = b
-    oldc = c
-    oldd = d
-
-    k_i = ff_i = 0
-
-    F(7, 12, 17, 22)
-    F(5, 9, 14, 20)
-    F(4, 11, $16, 23)
-    F(6, 10, 15, 21)
-
-    a = 0 | a + olda
-    b = 0 | b + oldb
-    c = 0 | c + oldc
+  x[l + 64 >>> 9 << 4 | 14] = 0 | l;
+  x[l >>> 5] |= 0x80 << l % 32;
+
+  for (; i < x.length; i += 16) {
+    for (oi = j = 0; j < 64; oi -= 6) {
+      output[oi & 3] = (
+        t0 = 0 | (
+          (
+            t0 = o(),
+            t1 = o(),
+            t2 = o(),
+            (l = j >> 4 << 2)
+              ? l > 4
+                ? l > 8
+                  ? t1 ^ (t0 | ~t2)  // Round 4: II
+                  : t0 ^ t1 ^ t2     // Round 3: HH
+                : t0 & t2 | t1 & ~t2 // Round 2: GG
+              : t0 & t1 | ~t0 & t2   // Round 1: FF
+          ) +
+          (
+            0 | x[i + (j * (0x7351 >> l) + (0x0510 >> l) & 15)]
+          ) +
+          (
+            t1 = "',16%).4$+07&*/5".charCodeAt(l + j % 4) - 32,
+            K[63 - j++] ??= 0 | 2 ** 32 * Math.abs(Math.sin(j))
+          ) +
+          o()
+        ),
+        0 | (t0 << t1 | t0 >>> 32 - t1) + o()
+      )
+    }
+    for (oi = 4; oi;) {
+      oldOutput[--oi] = output[oi] = 0 | oldOutput[oi] + output[oi]
+    }
   }
-  return [a, b, c, d]
+  return output
 }
 
 /**
  * Convert bytes to an array of little-endian words
  *
- * @param {Uint8Array} input Raw bytes
- * @returns {number[]} Array of little-endian words
+ * @param {string | Uint8Array} input
+ * @param {number} padLen
+ * 
+ * @param {number[]} [output]
+ * 
+ * @returns {[number[], number]}
  */
-let bytesToBinl = (input) => {
-  var i = input[$length]
-  /** @type {number[]} */
-  var output = []
+let inputToBinl = (
+  input,
+  padLen,
+  // var:
+  i = (
+    typeof input == 'string'
+      ? input = new TextEncoder().encode(input)
+      : input
+  ).length,
+  output = [],
+  bitLen = 8 * i,
+) => {
   for (; i;) {
-    output[floor(--i / 4)] |= input[i] << i % 4 * 8
+    output[padLen + (--i >>> 2)] |= /**@type {Uint8Array}*/(input)[i] << i % 4 * 8
   }
-  return output
+  return [output, bitLen]
 }
 
-/**
- * @param {string | Uint8Array} input 
- * @returns {Uint8Array}
- */
-let inputToBytes = (input) => (
-  typeof input == 'string'
-    ? new TextEncoder().encode(input)
-    : input
-)
-
 /**
  * @overload
  * @param {string | Uint8Array} data
@@ -173,30 +132,28 @@ let inputToBytes = (input) => (
  * @returns {string | Uint8Array<ArrayBuffer>} The MD5 (or HMAC‑MD5) digest, either as a hex string or a Uint8Array.
  */
 var md5 = (data, key, raw) => {
-  var bdata = bytesToBinl(data = inputToBytes(data))
-    , bitLen = data[$length] * 8
-    , i = $16
-    , out = new Uint8Array($16)
-  /** @type {*} */
-  var bkey
-    , pad = (/**@type {number}*/ x) => {
-      bdata.unshift(...$Array($16))
-      for (; i;) {
-        bdata[--i] = x ^ bkey[i]
-      }
-      i = $16
-    }
+  var i = 16
+    , hasKey = key != null
+    , [bdata, bitLen] = inputToBinl(data, /**@type {*}*/(hasKey) * i)
+    , out = new Uint8Array(i)
 
-  if (key != null) {
+  if (hasKey) {
     // HMAC
-    bkey = bytesToBinl(key = inputToBytes(key))
-    if (bkey[$length] > $16) {
-      bkey = binlMD5(bkey, key[$length] * 8)
+    let [bkey, keyBitlen] = inputToBinl(key, 0)
+      , pad = (/**@type {number}*/ x) => {
+        for (; i;) {
+          bdata[--i] = 0x01010101 * x ^ bkey[i]
+        }
+        i = 16
+      }
+    if (keyBitlen > 512) {
+      bkey = binlMD5(bkey, keyBitlen)
     }
-    pad(0x36363636)
+    pad(0x36)
     bdata = binlMD5(bdata, 512 + bitLen)
-    pad(0x5c5c5c5c)
-    bitLen = 512 + 128
+    bdata.unshift(...Array(16))
+    pad(0x5c)
+    bitLen = 640
   }
 
   bdata = binlMD5(bdata, bitLen)
@@ -208,7 +165,7 @@ var md5 = (data, key, raw) => {
 
   return raw
     ? out
-    : out.reduce((p, v) => p + (v >> 4 && '') + v.toString($16), '')
+    : out.reduce((p, v) => p + (v >> 4 && '') + v.toString(16), '')
 }
 
 export default md5

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "tinyhmacmd5",
-  "version": "0.0.4",
-  "description": "A tiny JavaScript HMAC-MD5 implementation. The minified browser bundle is only 1160 bytes.",
+  "version": "0.0.6",
+  "description": "A tiny JavaScript HMAC-MD5 implementation. The minified browser bundle is only 965 bytes.",
   "author": "bddjr",
   "license": "MIT",
   "type": "module",
@@ -13,6 +13,7 @@
     "main.d.ts",
     "browser.min.js"
   ],
+  "homepage": "https://bddjr.github.io/tinyhmacmd5/",
   "keywords": [
     "md5",
     "hmac",