tinyhmacmd5 0.0.4 → 0.0.5

package/README.md

@@ -2,7 +2,7 @@
 
 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 1029 bytes.
 
 ## 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),"")}}
+{let r="length",e=16,n=2**32,t=1732584193,o=271733878,a=~t,f=~o,u=Math,i=u.floor,l=[738695,669989,770404,703814],d=Array(64),s=(s,v)=>{var y,c,g,h,A,w=0,b=i((v+64)/512)*e+14,m=[t,f,a,o],p=[...m],x=r=>m[3&++A];for(s[i(v/32)]|=128<<v%32,s[b]=0|v,s[b+1]=0|v/n;w<s[r];w+=e){for(A=b=0;b<64;A-=6)m[3&A]=(c=x(),g=x(),h=x(),0|((c=((y=b>>4)?y>1?y>2?g^(c|~h):c^g^h:c&h|g&~h:c&g|~c&h)+(0|s[w+(b*(29521>>4*y)+(1296>>4*y)&15)])+(g=l[y]>>b%4*5&31,d[b++]??=0|n*u.abs(u.sin(b)))+x())<<g|c>>>32-g)+x());for(A=4;A;)p[--A]=m[A]=0|p[A]+m[A]}return m},v=e=>{for(var n=e[r],t=[];n;)t[i(--n/4)]|=e[n]<<n%4*8;return t},y=r=>"string"==typeof r?(new TextEncoder).encode(r):r;var md5=(n,t,o)=>{var a,f=v(n=y(n)),u=8*n[r],i=e,l=new Uint8Array(e),d=r=>{for(f.unshift(...Array(e));i;)f[--i]=16843009*r^a[i];i=e};for(null!=t&&((a=v(t=y(t)))[r]>e&&(a=s(a,8*t[r])),d(54),f=s(f,512+u),d(92),u=640),f=s(f,u);i;)l[--i]=f[i>>2]>>>i%4*8;return o?l:l.reduce((r,n)=>r+(n>>4&&"")+n.toString(e),"")}}

package/main.js

@@ -10,22 +10,25 @@ let $16 = 16
 
 let $2_32 = 2 ** 32
 
-let $Array = Array
+let A = 1732584193
+  , D = 271733878
+  , C = ~A
+  , B = ~D
 
 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)
+/** @type {number[]} */
+let S = [
+  738695, // 7, 12, 17, 22
+  669989, // 5,  9, 14, 20
+  770404, // 4, 11, 16, 23
+  703814, // 6, 10, 15, 21
 ]
 
 /** @type {number[]} MD5 constants cached in memory */
-let K = $Array(64)
+let K = Array(64)
 
 /**
  * Calculate the MD5 of an array of little-endian words, and a bit length.
@@ -36,89 +39,58 @@ let K = $Array(64)
  */
 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
+    , l
+    , t0
+    , t1
+    , t2
 
   /** @type {number} */
-  var k_i
+  var oi
 
-  /** @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++
-  }
+  /** @type {[number, number, number, number]} */
+  var 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
+  for (; i < x[$length]; i += $16) {
+    for (oi = j = 0; j < 64; oi -= 6) {
+      output[oi & 3] = (
+        t0 = (
+          (
+            t0 = o(),
+            t1 = o(),
+            t2 = o(),
+            (l = j >> 4)
+              ? l > 1
+                ? l > 2
+                  ? t1 ^ (t0 | ~t2)  // 3
+                  : t0 ^ t1 ^ t2     // 2
+                : t0 & t2 | t1 & ~t2 // 1
+              : t0 & t1 | ~t0 & t2   // 0
+          ) +
+          (
+            0 | x[i + (j * (0x7351 >> l * 4) + (0x0510 >> l * 4) & 15)]
+          ) +
+          (
+            t1 = S[l] >> j % 4 * 5 & 31,
+            K[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
 }
 
 /**
@@ -180,9 +152,9 @@ var md5 = (data, key, raw) => {
   /** @type {*} */
   var bkey
     , pad = (/**@type {number}*/ x) => {
-      bdata.unshift(...$Array($16))
+      bdata.unshift(...Array($16))
       for (; i;) {
-        bdata[--i] = x ^ bkey[i]
+        bdata[--i] = 0x01010101 * x ^ bkey[i]
       }
       i = $16
     }
@@ -193,9 +165,9 @@ var md5 = (data, key, raw) => {
     if (bkey[$length] > $16) {
       bkey = binlMD5(bkey, key[$length] * 8)
     }
-    pad(0x36363636)
+    pad(0x36)
     bdata = binlMD5(bdata, 512 + bitLen)
-    pad(0x5c5c5c5c)
+    pad(0x5c)
     bitLen = 512 + 128
   }
 

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.5",
+  "description": "A tiny JavaScript HMAC-MD5 implementation. The minified browser bundle is only 1029 bytes.",
   "author": "bddjr",
   "license": "MIT",
   "type": "module",