tinyhmacmd5 0.0.3 → 0.0.4

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 2471 bytes.
+The minified browser bundle ([`browser.min.js`](browser.min.js)) is only 1160 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=Math,o=t.floor,a=(r,e)=>0|(0|r)+(0|e),f=(r,e)=>r<<e|r>>>32-e,l=(r,e,n,t,o,l)=>a(f(a(e,r)+a(t,l),o),n),i=(r,e,n,t,o,a,f)=>l(e&n|~e&t,r,e,o,a,f),u=(r,e,n,t,o,a,f)=>l(e&t|n&~t,r,e,o,a,f),s=(r,e,n,t,o,a,f)=>l(e^n^t,r,e,o,a,f),c=(r,e,n,t,o,a,f)=>l(n^(e|~t),r,e,o,a,f),d=[],v=(f,l)=>{var v,g,h,w,y,b=0,m=1732584193,p=271733878,x=~m,A=~p,E=o((l+64)/512)*e+14,M=r=>d[y++]??=0|n*t.abs(t.sin(y));for(f[o(l/32)]|=128<<l%32,f[E]=0|l,f[E+1]=0|l/n;b<f[r];p=a(p,w)){let[r,n,t,o,l,d,E,S,T,U,j,k,q,z,B,C]=f.slice(b,b+=e);v=m,g=A,h=x,w=p,y=0,m=i(m,A,x,p,r,7,M()),p=i(p,m,A,x,n,12,M()),x=i(x,p,m,A,t,17,M()),A=i(A,x,p,m,o,22,M()),m=i(m,A,x,p,l,7,M()),p=i(p,m,A,x,d,12,M()),x=i(x,p,m,A,E,17,M()),A=i(A,x,p,m,S,22,M()),m=i(m,A,x,p,T,7,M()),p=i(p,m,A,x,U,12,M()),x=i(x,p,m,A,j,17,M()),A=i(A,x,p,m,k,22,M()),m=i(m,A,x,p,q,7,M()),p=i(p,m,A,x,z,12,M()),x=i(x,p,m,A,B,17,M()),A=i(A,x,p,m,C,22,M()),m=u(m,A,x,p,n,5,M()),p=u(p,m,A,x,E,9,M()),x=u(x,p,m,A,k,14,M()),A=u(A,x,p,m,r,20,M()),m=u(m,A,x,p,d,5,M()),p=u(p,m,A,x,j,9,M()),x=u(x,p,m,A,C,14,M()),A=u(A,x,p,m,l,20,M()),m=u(m,A,x,p,U,5,M()),p=u(p,m,A,x,B,9,M()),x=u(x,p,m,A,o,14,M()),A=u(A,x,p,m,T,20,M()),m=u(m,A,x,p,z,5,M()),p=u(p,m,A,x,t,9,M()),x=u(x,p,m,A,S,14,M()),A=u(A,x,p,m,q,20,M()),m=s(m,A,x,p,d,4,M()),p=s(p,m,A,x,T,11,M()),x=s(x,p,m,A,k,e,M()),A=s(A,x,p,m,B,23,M()),m=s(m,A,x,p,n,4,M()),p=s(p,m,A,x,l,11,M()),x=s(x,p,m,A,S,e,M()),A=s(A,x,p,m,j,23,M()),m=s(m,A,x,p,z,4,M()),p=s(p,m,A,x,r,11,M()),x=s(x,p,m,A,o,e,M()),A=s(A,x,p,m,E,23,M()),m=s(m,A,x,p,U,4,M()),p=s(p,m,A,x,q,11,M()),x=s(x,p,m,A,C,e,M()),A=s(A,x,p,m,t,23,M()),m=c(m,A,x,p,r,6,M()),p=c(p,m,A,x,S,10,M()),x=c(x,p,m,A,B,15,M()),A=c(A,x,p,m,d,21,M()),m=c(m,A,x,p,q,6,M()),p=c(p,m,A,x,o,10,M()),x=c(x,p,m,A,j,15,M()),A=c(A,x,p,m,n,21,M()),m=c(m,A,x,p,T,6,M()),p=c(p,m,A,x,C,10,M()),x=c(x,p,m,A,E,15,M()),A=c(A,x,p,m,z,21,M()),m=c(m,A,x,p,l,6,M()),p=c(p,m,A,x,k,10,M()),x=c(x,p,m,A,t,15,M()),A=c(A,x,p,m,U,21,M()),m=a(m,v),A=a(A,g),x=a(x,h)}return[m,A,x,p]},g=e=>{for(var n=e[r],t=[];n;)t[o(--n/4)]|=e[n]<<n%4*8;return t},h=r=>"string"==typeof r?(new TextEncoder).encode(r):r;var md5=(n,t,o)=>{var a,f=g(n=h(n)),l=8*n[r],i=e,u=new Uint8Array(e),s=r=>{for(;i;)f.unshift(r^a[--i]);i=e};for(null!=t&&((a=g(t=h(t)))[r]>e&&(a=v(a,8*t[r])),s(909522486),f=v(f,512+l),s(1549556828),l=640),f=v(f,l);i;)u[--i]=f[i>>2]>>>i%4*8;return o?u:u.reduce((r,n)=>r+(n>>4&&"")+n.toString(e),"")}}
+{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),"")}}

package/main.js

@@ -8,102 +8,24 @@ let $length = "length"
 /** @type {16} */
 let $16 = 16
 
-/** @type {number} */
 let $2_32 = 2 ** 32
 
+let $Array = Array
+
 let $Math = Math
 
 let floor = $Math.floor
 
-/**
- * Add integers, wrapping at 2^32.
- *
- * @param {number} x First integer
- * @param {number} y Second integer
- * @returns {number} Sum
- */
-let safeAdd = (x, y) => 0 | (0 | x) + (0 | y)
-
-/**
- * Bitwise rotate a 32-bit number to the left.
- *
- * @param {number} num 32-bit number
- * @param {number} cnt Rotation count
- * @returns {number} Rotated number
- */
-let bitRotateLeft = (num, cnt) => (num << cnt) | (num >>> (32 - cnt))
-
-/**
- * Basic operation the algorithm uses.
- *
- * @param {number} q q
- * @param {number} a a
- * @param {number} b b
- * @param {number} x x
- * @param {number} s s
- * @param {number} t t
- * @returns {number} Result
- */
-let md5cmn = (q, a, b, x, s, t) => safeAdd(bitRotateLeft(safeAdd(a, q) + safeAdd(x, t), s), b)
-
-/**
- * Basic operation the algorithm uses.
- *
- * @param {number} a a
- * @param {number} b b
- * @param {number} c c
- * @param {number} d d
- * @param {number} x x
- * @param {number} s s
- * @param {number} t t
- * @returns {number} Result
- */
-let md5ff = (a, b, c, d, x, s, t) => md5cmn((b & c) | (~b & d), a, b, x, s, t)
-
-/**
- * Basic operation the algorithm uses.
- *
- * @param {number} a a
- * @param {number} b b
- * @param {number} c c
- * @param {number} d d
- * @param {number} x x
- * @param {number} s s
- * @param {number} t t
- * @returns {number} Result
- */
-let md5gg = (a, b, c, d, x, s, t) => md5cmn((b & d) | (c & ~d), a, b, x, s, t)
-
-/**
- * Basic operation the algorithm uses.
- *
- * @param {number} a a
- * @param {number} b b
- * @param {number} c c
- * @param {number} d d
- * @param {number} x x
- * @param {number} s s
- * @param {number} t t
- * @returns {number} Result
- */
-let md5hh = (a, b, c, d, x, s, t) => md5cmn(b ^ c ^ d, a, b, x, s, t)
-
-/**
- * Basic operation the algorithm uses.
- *
- * @param {number} a a
- * @param {number} b b
- * @param {number} c c
- * @param {number} d d
- * @param {number} x x
- * @param {number} s s
- * @param {number} t t
- * @returns {number} Result
- */
-let md5ii = (a, b, c, d, x, s, t) => md5cmn(c ^ (b | ~d), a, b, x, s, t)
+/** @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[]} MD5 constants cached in memory */
-let K = []
+let K = $Array(64)
 
 /**
  * Calculate the MD5 of an array of little-endian words, and a bit length.
@@ -122,100 +44,79 @@ let binlMD5 = (x, bitLen) => {
     , d = 271733878
     , c = ~a
     , b = ~d
-    , padLenIndex = floor((bitLen + 64) / 512) * $16 + 14
+    , j = floor((bitLen + 64) / 512) * $16 + 14
+
   /** @type {number} */
   var k_i
-    , k = (/**@type {*}*/ _) => K[k_i++] ??= 0 | $2_32 * $Math.abs($Math.sin(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++
+  }
 
   // append padding
   x[floor(bitLen / 32)] |= 0x80 << bitLen % 32;
-  x[padLenIndex] = 0 | bitLen;
-  x[padLenIndex + 1] = 0 | bitLen / $2_32;
-
-  for (; i < x[$length]; d = safeAdd(d, oldd)) {
-    let [
-      x0, x1, x2, x3, x4, x5, x6, x7,
-      x8, x9, x10, x11, x12, x13, x14, x15
-    ] = x.slice(i, i += $16)
+  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 = 0
-
-    a = md5ff(a, b, c, d, x0, 7, k())
-    d = md5ff(d, a, b, c, x1, 12, k())
-    c = md5ff(c, d, a, b, x2, 17, k())
-    b = md5ff(b, c, d, a, x3, 22, k())
-    a = md5ff(a, b, c, d, x4, 7, k())
-    d = md5ff(d, a, b, c, x5, 12, k())
-    c = md5ff(c, d, a, b, x6, 17, k())
-    b = md5ff(b, c, d, a, x7, 22, k())
-    a = md5ff(a, b, c, d, x8, 7, k())
-    d = md5ff(d, a, b, c, x9, 12, k())
-    c = md5ff(c, d, a, b, x10, 17, k())
-    b = md5ff(b, c, d, a, x11, 22, k())
-    a = md5ff(a, b, c, d, x12, 7, k())
-    d = md5ff(d, a, b, c, x13, 12, k())
-    c = md5ff(c, d, a, b, x14, 17, k())
-    b = md5ff(b, c, d, a, x15, 22, k())
-
-    a = md5gg(a, b, c, d, x1, 5, k())
-    d = md5gg(d, a, b, c, x6, 9, k())
-    c = md5gg(c, d, a, b, x11, 14, k())
-    b = md5gg(b, c, d, a, x0, 20, k())
-    a = md5gg(a, b, c, d, x5, 5, k())
-    d = md5gg(d, a, b, c, x10, 9, k())
-    c = md5gg(c, d, a, b, x15, 14, k())
-    b = md5gg(b, c, d, a, x4, 20, k())
-    a = md5gg(a, b, c, d, x9, 5, k())
-    d = md5gg(d, a, b, c, x14, 9, k())
-    c = md5gg(c, d, a, b, x3, 14, k())
-    b = md5gg(b, c, d, a, x8, 20, k())
-    a = md5gg(a, b, c, d, x13, 5, k())
-    d = md5gg(d, a, b, c, x2, 9, k())
-    c = md5gg(c, d, a, b, x7, 14, k())
-    b = md5gg(b, c, d, a, x12, 20, k())
-
-    a = md5hh(a, b, c, d, x5, 4, k())
-    d = md5hh(d, a, b, c, x8, 11, k())
-    c = md5hh(c, d, a, b, x11, $16, k())
-    b = md5hh(b, c, d, a, x14, 23, k())
-    a = md5hh(a, b, c, d, x1, 4, k())
-    d = md5hh(d, a, b, c, x4, 11, k())
-    c = md5hh(c, d, a, b, x7, $16, k())
-    b = md5hh(b, c, d, a, x10, 23, k())
-    a = md5hh(a, b, c, d, x13, 4, k())
-    d = md5hh(d, a, b, c, x0, 11, k())
-    c = md5hh(c, d, a, b, x3, $16, k())
-    b = md5hh(b, c, d, a, x6, 23, k())
-    a = md5hh(a, b, c, d, x9, 4, k())
-    d = md5hh(d, a, b, c, x12, 11, k())
-    c = md5hh(c, d, a, b, x15, $16, k())
-    b = md5hh(b, c, d, a, x2, 23, k())
+    k_i = ff_i = 0
 
-    a = md5ii(a, b, c, d, x0, 6, k())
-    d = md5ii(d, a, b, c, x7, 10, k())
-    c = md5ii(c, d, a, b, x14, 15, k())
-    b = md5ii(b, c, d, a, x5, 21, k())
-    a = md5ii(a, b, c, d, x12, 6, k())
-    d = md5ii(d, a, b, c, x3, 10, k())
-    c = md5ii(c, d, a, b, x10, 15, k())
-    b = md5ii(b, c, d, a, x1, 21, k())
-    a = md5ii(a, b, c, d, x8, 6, k())
-    d = md5ii(d, a, b, c, x15, 10, k())
-    c = md5ii(c, d, a, b, x6, 15, k())
-    b = md5ii(b, c, d, a, x13, 21, k())
-    a = md5ii(a, b, c, d, x4, 6, k())
-    d = md5ii(d, a, b, c, x11, 10, k())
-    c = md5ii(c, d, a, b, x2, 15, k())
-    b = md5ii(b, c, d, a, x9, 21, k())
+    F(7, 12, 17, 22)
+    F(5, 9, 14, 20)
+    F(4, 11, $16, 23)
+    F(6, 10, 15, 21)
 
-    a = safeAdd(a, olda)
-    b = safeAdd(b, oldb)
-    c = safeAdd(c, oldc)
+    a = 0 | a + olda
+    b = 0 | b + oldb
+    c = 0 | c + oldc
   }
   return [a, b, c, d]
 }
@@ -279,8 +180,9 @@ var md5 = (data, key, raw) => {
   /** @type {*} */
   var bkey
     , pad = (/**@type {number}*/ x) => {
+      bdata.unshift(...$Array($16))
       for (; i;) {
-        bdata.unshift(x ^ bkey[--i])
+        bdata[--i] = x ^ bkey[i]
       }
       i = $16
     }
@@ -307,7 +209,6 @@ var md5 = (data, key, raw) => {
   return raw
     ? out
     : out.reduce((p, v) => p + (v >> 4 && '') + v.toString($16), '')
-  // : out.toHex()
 }
 
 export default md5

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "tinyhmacmd5",
-  "version": "0.0.3",
-  "description": "A tiny JavaScript HMAC-MD5 implementation. The minified browser bundle is only 2471 bytes.",
+  "version": "0.0.4",
+  "description": "A tiny JavaScript HMAC-MD5 implementation. The minified browser bundle is only 1160 bytes.",
   "author": "bddjr",
   "license": "MIT",
   "type": "module",
@@ -29,11 +29,12 @@
     "url": "git+https://github.com/bddjr/tinyhmacmd5.git"
   },
   "devDependencies": {
+    "es-check": "^9.6.4",
     "terser": "^5.49.0",
     "tinyhmacmd5": "link:"
   },
   "scripts": {
-    "build": "node scripts/build.mjs",
-    "test": "node scripts/build.mjs && node scripts/test.mjs"
+    "build": "node scripts/build.mjs && es-check es2021 --module --checkFeatures main.js browser.min.js",
+    "test": "pnpm build && node scripts/test.mjs"
   }
 }