添加 hmac_md5 公式支持

Author: linzhijun

README.md

@@ -4,7 +4,7 @@ ToolGood.Algorithm
 
 ToolGood.Algorithm是一个功能强大、轻量级、兼容`Excel公式`的算法类库，旨在提高开发人员在不同业务场景中的生产力。 
 
-WebAssembly版本，请看csharp文件夹下`ToolGood.Algorithm.WebAssembly`,`ToolGood.Algorithm2.WebTest` 两个项目。注意：不支持HmacMd5
+WebAssembly版本，请看csharp文件夹下`ToolGood.Algorithm.WebAssembly`,`ToolGood.Algorithm2.WebTest` 两个项目。
 
 **适用场景：** 代码与算法分离，避免项目强制升级
 

csharp/ToolGood.Algorithm2.WebTest/wwwroot/Test/test-csharp.js

@@ -107,8 +107,8 @@
 
         dt = engine.TryEvaluate("Crc32('&=我中国人 >||')", null);
         assert.equal(dt, "60649EFF");
-        //dt = engine.TryEvaluate("HmacMd5('&=我中国人 >||','12')", null);
-        //assert.equal(dt, "CF3923196E21B1E270FD72B089B092BB"); //不支持HmacMd5
+        dt = engine.TryEvaluate("HmacMd5('&=我中国人 >||','12')", null);
+        assert.equal(dt, "CF3923196E21B1E270FD72B089B092BB"); //不支持HmacMd5
 
 
         dt = engine.TryEvaluate("HmacSha1('&=我中国人 >||','12')", null);

csharp/ToolGood.Algorithm2.WebTest/wwwroot/_framework/ToolGood.Algorithm.WebAssembly.wasm

@@ -1,7 +1,7 @@
 {
   "mainAssemblyName": "ToolGood.Algorithm.WebAssembly",
   "resources": {
-    "hash": "sha256-QI/VSIEswxA96S4yaYSkJ3CysXws5wLn7QRQ/1XPDbw=",
+    "hash": "sha256-FiXkY7fbGhJ3skTFJvGGasmrUbxJ9dxndAcVs9a5uE0=",
     "jsModuleNative": {
       "dotnet.native.8.0.4.rkw194kvb3.js": "sha256-ju0+XWE0ihz554eKEj0HQ8Opa61xpbUIaX5/MNo8we4="
     },
@@ -209,12 +209,12 @@
       "mscorlib.wasm": "sha256-VCfYgt1mcjITabSTosCDVZ+68ea3Z7kakTFaLNLG+18=",
       "netstandard.wasm": "sha256-YOZxxR9PM3Dltcijfb0Q4FD39DkWZbZ1e2ScbZDvWJ4=",
       "System.Private.CoreLib.wasm": "sha256-NrT1QkAzVU//2wgK9vXdq77lCGvLJ4IOZ+Aegesyanc=",
-      "ToolGood.Algorithm.wasm": "sha256-iIpw7biw9MMOA/9L5trgPn9UCNnmi/TttCxGBptG2DU=",
-      "ToolGood.Algorithm.WebAssembly.wasm": "sha256-/Yza5+IFkK1hJzI+qIsyEnVMaUenmi0kkWyGjKGqNCc="
+      "ToolGood.Algorithm.wasm": "sha256-NDbHwdElZXxCEPm8FwjFH1HOPi5J/JaDPKi3q6cNaFU=",
+      "ToolGood.Algorithm.WebAssembly.wasm": "sha256-qL9e/AbTVDT+yBJoIPnMGTwmHbbTq00oPCpX68uHtjY="
     },
     "pdb": {
-      "ToolGood.Algorithm.pdb": "sha256-FNZNFzxsM7qnVhnpuPNAHfqH//i2gqiOdJASOBRlBbw=",
-      "ToolGood.Algorithm.WebAssembly.pdb": "sha256-S97uA59sQzhfTjNw1ctoFPnLC/Rm5BhdCmkoZR2NVlQ="
+      "ToolGood.Algorithm.pdb": "sha256-LLYQ5zCB53ruPKl6jtP08pZ0wTFDzjggRDnzCYnCaa0=",
+      "ToolGood.Algorithm.WebAssembly.pdb": "sha256-VDrYvhH9hk8bctDanGJThOLKxR4g1vL3i5mk1ru7G5w="
     }
   },
   "cacheBootResources": true,

csharp/ToolGood.Algorithm2.WebTest/wwwroot/_framework/ToolGood.Algorithm.wasm

@@ -151,11 +151,18 @@ public static string GetSha512String(byte[] buffer)
         #region HMACMD5
         public static string GetHmacMd5String(byte[] buffer, string secret)
         {
+#if WebAssembly
             byte[] keyByte = System.Text.Encoding.UTF8.GetBytes(secret ?? "");
+            return MD5.hmac_md5(buffer, keyByte);
+#else
+        byte[] keyByte = System.Text.Encoding.UTF8.GetBytes(secret ?? "");
             using (var hmacsha256 = new HMACMD5(keyByte)) {
                 byte[] hashmessage = hmacsha256.ComputeHash(buffer);
                 return BitConverter.ToString(hashmessage).Replace("-", "");
             }
+#endif
+
+
         }
         #endregion
 

csharp/ToolGood.Algorithm2.WebTest/wwwroot/_framework/blazor.boot.json

@@ -277,13 +277,21 @@ public static string ArrayToHexString(byte[] array, bool uppercase)
         }
         public static string MDString(byte[] c)
         {
-            byte[] b = new byte[c.Length];
-            for (int i = 0; i < c.Length; i++) {
-                b[i] = (byte)c[i];
-            }
-            byte[] digest = MD5Array(b);
+            //byte[] b = new byte[c.Length];
+            //for (int i = 0; i < c.Length; i++) {
+            //    b[i] = (byte)c[i];
+            //}
+            byte[] digest = MD5Array(c);
             return ArrayToHexString(digest, true);
         }
+        public static byte[] ComputeHash(byte[] c)
+        {
+            //byte[] b = new byte[c.Length];
+            //for (int i = 0; i < c.Length; i++) {
+            //    b[i] = (byte)c[i];
+            //}
+            return MD5Array(c);
+        }
 
         //public static string MDString(string message)
         //{
@@ -296,6 +304,48 @@ public static string MDString(byte[] c)
         //    return ArrayToHexString(digest, false);
         //}
 
+
+        public static string hmac_md5(byte[] b_tmp1, byte[] source)
+        {
+            byte[] b_tmp;
+            string szRet = string.Empty;
+
+            byte[] digest = new byte[512];
+            byte[] k_ipad = new byte[64];
+            byte[] k_opad = new byte[64];
+            for (int i = 0; i < 64; i++) {
+                k_ipad[i] = 0 ^ 0x36;
+                k_opad[i] = 0 ^ 0x5c;
+            }
+            if (source.Length > 64) {
+                source = ComputeHash(source);
+            }
+            for (int i = 0; i < source.Length; i++) {
+                k_ipad[i] = (byte)(source[i] ^ 0x36);
+                k_opad[i] = (byte)(source[i] ^ 0x5c);
+            }
+
+            //b_tmp1 = System.Text.ASCIIEncoding.ASCII.GetBytes(timespan);
+            b_tmp = adding(k_ipad, b_tmp1);
+            digest = ComputeHash(b_tmp);
+            b_tmp = adding(k_opad, digest);
+            digest = ComputeHash(b_tmp);
+            //             for (int i = 0; i < digest.Length; i++)
+            //             {
+            //outdigest = System.Text.ASCIIEncoding.ASCII.GetString(digest);//[i].ToString();// 
+            //                 
+            return ArrayToHexString(digest, true);                               //             }
+        }
+        /***
+       * * 填充byte
+        ***/
+        public static byte[] adding(byte[] a, byte[] b)
+        {
+            byte[] c = new byte[a.Length + b.Length];
+            a.CopyTo(c, 0);
+            b.CopyTo(c, a.Length);
+            return c;
+        }
     }
 }