优化SM4加密解密方法，将密钥放在统一位置。

解决SM4加密默认方法需要base64字符串，切需要16的倍数，现在可以加密任意字符串

Admin.NET/Admin.NET.Core/Util/CryptogramUtil.cs

@@ -1,120 +1,122 @@
-// 麻省理工学院许可证
-//
-// 版权所有 (c) 2021-2023 zuohuaijun，大名科技（天津）有限公司  联系电话/微信：18020030720  QQ：515096995
-//
-// 特此免费授予获得本软件的任何人以处理本软件的权利，但须遵守以下条件：在所有副本或重要部分的软件中必须包括上述版权声明和本许可声明。
-//
-// 软件按“原样”提供，不提供任何形式的明示或暗示的保证，包括但不限于对适销性、适用性和非侵权的保证。
-// 在任何情况下，作者或版权持有人均不对任何索赔、损害或其他责任负责，无论是因合同、侵权或其他方式引起的，与软件或其使用或其他交易有关。
-
-namespace Admin.NET.Core;
-
-public class CryptogramUtil
-{
-    public static readonly bool StrongPassword = App.GetConfig<bool>("Cryptogram:StrongPassword"); // 是否开启密码强度验证
-    public static readonly string PasswordStrengthValidation = App.GetConfig<string>("Cryptogram:PasswordStrengthValidation"); // 密码强度验证正则表达式
-    public static readonly string PasswordStrengthValidationMsg = App.GetConfig<string>("Cryptogram:PasswordStrengthValidationMsg"); // 密码强度验证提示
-    public static readonly string CryptoType = App.GetConfig<string>("Cryptogram:CryptoType"); // 加密类型
-    public static readonly string PublicKey = App.GetConfig<string>("Cryptogram:PublicKey"); // 公钥
-    public static readonly string PrivateKey = App.GetConfig<string>("Cryptogram:PrivateKey"); // 私钥
-
-    /// <summary>
-    /// 加密
-    /// </summary>
-    /// <param name="plainText"></param>
-    /// <returns></returns>
-    public static string Encrypt(string plainText)
-    {
-        if (CryptoType == CryptogramEnum.MD5.ToString())
-        {
-            return MD5Encryption.Encrypt(plainText);
-        }
-        else if (CryptoType == CryptogramEnum.SM2.ToString())
-        {
-            return SM2Encrypt(plainText);
-        }
-        else if (CryptoType == CryptogramEnum.SM4.ToString())
-        {
-            return SM4EncryptECB(plainText);
-        }
-        return plainText;
-    }
-
-    /// <summary>
-    /// 解密
-    /// </summary>
-    /// <param name="cipherText"></param>
-    /// <returns></returns>
-    public static string Decrypt(string cipherText)
-    {
-        if (CryptoType == CryptogramEnum.SM2.ToString())
-        {
-            return SM2Decrypt(cipherText);
-        }
-        else if (CryptoType == CryptogramEnum.SM4.ToString())
-        {
-            return SM4DecryptECB(cipherText);
-        }
-        return cipherText;
-    }
-
-    /// <summary>
-    /// SM2加密
-    /// </summary>
-    /// <param name="plainText"></param>
-    /// <returns></returns>
-    public static string SM2Encrypt(string plainText)
-    {
-        return GMUtil.SM2Encrypt(PublicKey, plainText);
-    }
-
-    /// <summary>
-    /// SM2解密
-    /// </summary>
-    /// <param name="cipherText"></param>
-    /// <returns></returns>
-    public static string SM2Decrypt(string cipherText)
-    {
-        return GMUtil.SM2Decrypt(PrivateKey, cipherText);
-    }
-
-    /// <summary>
-    /// SM4加密（ECB）
-    /// </summary>
-    /// <param name="plainText"></param>
-    /// <returns></returns>
-    public static string SM4EncryptECB(string plainText)
-    {
-        return GMUtil.SM4EncryptECB(plainText);
-    }
-
-    /// <summary>
-    /// SM4解密（ECB）
-    /// </summary>
-    /// <param name="cipherText"></param>
-    /// <returns></returns>
-    public static string SM4DecryptECB(string cipherText)
-    {
-        return GMUtil.SM4DecryptECB(cipherText);
-    }
-
-    /// <summary>
-    /// SM4加密（CBC）
-    /// </summary>
-    /// <param name="plainText"></param>
-    /// <returns></returns>
-    public static string SM4EncryptCBC(string plainText)
-    {
-        return GMUtil.SM4EncryptCBC(plainText);
-    }
-
-    /// <summary>
-    /// SM4解密（CBC）
-    /// </summary>
-    /// <param name="cipherText"></param>
-    /// <returns></returns>
-    public static string SM4DecryptCBC(string cipherText)
-    {
-        return GMUtil.SM4DecryptCBC(cipherText);
-    }
+// 麻省理工学院许可证
+//
+// 版权所有 (c) 2021-2023 zuohuaijun，大名科技（天津）有限公司  联系电话/微信：18020030720  QQ：515096995
+//
+// 特此免费授予获得本软件的任何人以处理本软件的权利，但须遵守以下条件：在所有副本或重要部分的软件中必须包括上述版权声明和本许可声明。
+//
+// 软件按“原样”提供，不提供任何形式的明示或暗示的保证，包括但不限于对适销性、适用性和非侵权的保证。
+// 在任何情况下，作者或版权持有人均不对任何索赔、损害或其他责任负责，无论是因合同、侵权或其他方式引起的，与软件或其使用或其他交易有关。
+
+namespace Admin.NET.Core;
+
+public class CryptogramUtil
+{
+    public static readonly bool StrongPassword = App.GetConfig<bool>("Cryptogram:StrongPassword"); // 是否开启密码强度验证
+    public static readonly string PasswordStrengthValidation = App.GetConfig<string>("Cryptogram:PasswordStrengthValidation"); // 密码强度验证正则表达式
+    public static readonly string PasswordStrengthValidationMsg = App.GetConfig<string>("Cryptogram:PasswordStrengthValidationMsg"); // 密码强度验证提示
+    public static readonly string CryptoType = App.GetConfig<string>("Cryptogram:CryptoType"); // 加密类型
+    public static readonly string PublicKey = App.GetConfig<string>("Cryptogram:PublicKey"); // 公钥
+    public static readonly string PrivateKey = App.GetConfig<string>("Cryptogram:PrivateKey"); // 私钥
+
+	public static readonly string SM4_key = "0123456789abcdeffedcba9876543210";
+	public static readonly string SM4_iv = "595298c7c6fd271f0402f804c33d3f66";
+	/// <summary>
+	/// 加密
+	/// </summary>
+	/// <param name="plainText"></param>
+	/// <returns></returns>
+	public static string Encrypt(string plainText)
+    {
+        if (CryptoType == CryptogramEnum.MD5.ToString())
+        {
+            return MD5Encryption.Encrypt(plainText);
+        }
+        else if (CryptoType == CryptogramEnum.SM2.ToString())
+        {
+            return SM2Encrypt(plainText);
+        }
+        else if (CryptoType == CryptogramEnum.SM4.ToString())
+        {
+            return SM4EncryptECB(plainText);
+        }
+        return plainText;
+    }
+
+    /// <summary>
+    /// 解密
+    /// </summary>
+    /// <param name="cipherText"></param>
+    /// <returns></returns>
+    public static string Decrypt(string cipherText)
+    {
+        if (CryptoType == CryptogramEnum.SM2.ToString())
+        {
+            return SM2Decrypt(cipherText);
+        }
+        else if (CryptoType == CryptogramEnum.SM4.ToString())
+        {
+            return SM4DecryptECB(cipherText);
+        }
+        return cipherText;
+    }
+
+    /// <summary>
+    /// SM2加密
+    /// </summary>
+    /// <param name="plainText"></param>
+    /// <returns></returns>
+    public static string SM2Encrypt(string plainText)
+    {
+        return GMUtil.SM2Encrypt(PublicKey, plainText);
+    }
+
+    /// <summary>
+    /// SM2解密
+    /// </summary>
+    /// <param name="cipherText"></param>
+    /// <returns></returns>
+    public static string SM2Decrypt(string cipherText)
+    {
+        return GMUtil.SM2Decrypt(PrivateKey, cipherText);
+    }
+
+    /// <summary>
+    /// SM4加密（ECB）
+    /// </summary>
+    /// <param name="plainText"></param>
+    /// <returns></returns>
+    public static string SM4EncryptECB(string plainText)
+    {
+        return GMUtil.SM4EncryptECB(SM4_key, plainText);
+    }
+
+    /// <summary>
+    /// SM4解密（ECB）
+    /// </summary>
+    /// <param name="cipherText"></param>
+    /// <returns></returns>
+    public static string SM4DecryptECB(string cipherText)
+    {
+        return GMUtil.SM4DecryptECB(SM4_key, cipherText);
+    }
+
+    /// <summary>
+    /// SM4加密（CBC）
+    /// </summary>
+    /// <param name="plainText"></param>
+    /// <returns></returns>
+    public static string SM4EncryptCBC(string plainText)
+    {
+        return GMUtil.SM4EncryptCBC(SM4_key, SM4_iv, plainText);
+    }
+
+    /// <summary>
+    /// SM4解密（CBC）
+    /// </summary>
+    /// <param name="cipherText"></param>
+    /// <returns></returns>
+    public static string SM4DecryptCBC(string cipherText)
+    {
+        return GMUtil.SM4DecryptCBC(SM4_key,SM4_iv, cipherText);
+    }
 }

Admin.NET/Admin.NET.Core/Util/GM/GMUtil.cs

@@ -1,119 +1,154 @@
-// 麻省理工学院许可证
-//
-// 版权所有 (c) 2021-2023 zuohuaijun，大名科技（天津）有限公司  联系电话/微信：18020030720  QQ：515096995
-//
-// 特此免费授予获得本软件的任何人以处理本软件的权利，但须遵守以下条件：在所有副本或重要部分的软件中必须包括上述版权声明和本许可声明。
-//
-// 软件按“原样”提供，不提供任何形式的明示或暗示的保证，包括但不限于对适销性、适用性和非侵权的保证。
-// 在任何情况下，作者或版权持有人均不对任何索赔、损害或其他责任负责，无论是因合同、侵权或其他方式引起的，与软件或其使用或其他交易有关。
-
-using Org.BouncyCastle.Crypto;
-using Org.BouncyCastle.Math;
-using Org.BouncyCastle.Utilities.Encoders;
-
-namespace Admin.NET.Core;
-
-/// <summary>
-/// GM工具类
-/// </summary>
-public class GMUtil
-{
-    public const string SM4_key = "0123456789abcdeffedcba9876543210";
-    public const string SM4_iv = "595298c7c6fd271f0402f804c33d3f66";
-
-    /// <summary>
-    /// SM2加密
-    /// </summary>
-    /// <param name="publicKeyHex"></param>
-    /// <param name="data_string"></param>
-    /// <returns></returns>
-    public static string SM2Encrypt(string publicKeyHex, string data_string)
-    {
-        // 如果是130位公钥，.NET使用的话，把开头的04截取掉
-        if (publicKeyHex.Length == 130)
-        {
-            publicKeyHex = publicKeyHex.Substring(2, 128);
-        }
-        // 公钥X，前64位
-        string x = publicKeyHex.Substring(0, 64);
-        // 公钥Y，后64位
-        string y = publicKeyHex.Substring(64);
-        // 获取公钥对象
-        AsymmetricKeyParameter publicKey1 = GM.GetPublickeyFromXY(new BigInteger(x, 16), new BigInteger(y, 16));
-        // Sm2Encrypt: C1C3C2
-        // Sm2EncryptOld: C1C2C3
-        byte[] digestByte = GM.Sm2Encrypt(Encoding.UTF8.GetBytes(data_string), publicKey1);
-        string strSM2 = Hex.ToHexString(digestByte);
-        return strSM2;
-    }
-
-    /// <summary>
-    /// SM2解密
-    /// </summary>
-    /// <param name="privateKey_string"></param>
-    /// <param name="encryptedData_string"></param>
-    /// <returns></returns>
-    public static string SM2Decrypt(string privateKey_string, string encryptedData_string)
-    {
-        if (!encryptedData_string.StartsWith("04"))
-            encryptedData_string = "04" + encryptedData_string;
-        BigInteger d = new(privateKey_string, 16);
-        // 先拿到私钥对象，用ECPrivateKeyParameters 或 AsymmetricKeyParameter 都可以
-        // ECPrivateKeyParameters bcecPrivateKey = GmUtil.GetPrivatekeyFromD(d);
-        AsymmetricKeyParameter bcecPrivateKey = GM.GetPrivatekeyFromD(d);
-        byte[] byToDecrypt = Hex.Decode(encryptedData_string);
-        byte[] byDecrypted = GM.Sm2Decrypt(byToDecrypt, bcecPrivateKey);
-        string strDecrypted = Encoding.UTF8.GetString(byDecrypted);
-        return strDecrypted;
-    }
-
-    /// <summary>
-    /// SM4加密（ECB）
-    /// </summary>
-    /// <param name="plainText"></param>
-    /// <returns></returns>
-    public static string SM4EncryptECB(string plainText)
-    {
-        byte[] key = Hex.Decode(SM4_key);
-        byte[] bs = GM.Sm4EncryptECB(key, Hex.Decode(plainText), GM.SM4_ECB_NOPADDING);
-        return Hex.ToHexString(bs);
-    }
-
-    /// <summary>
-    /// SM4解密（ECB）
-    /// </summary>
-    /// <param name="cipherText"></param>
-    /// <returns></returns>
-    public static string SM4DecryptECB(string cipherText)
-    {
-        byte[] key = Hex.Decode(SM4_key);
-        byte[] bs = GM.Sm4DecryptECB(key, Hex.Decode(cipherText), GM.SM4_ECB_NOPADDING);
-        return Encoding.UTF8.GetString(bs);
-    }
-
-    /// <summary>
-    /// SM4加密（CBC）
-    /// </summary>
-    /// <param name="plainText"></param>
-    /// <returns></returns>
-    public static string SM4EncryptCBC(string plainText)
-    {
-        byte[] key = Hex.Decode(SM4_key);
-        byte[] iv = Hex.Decode(SM4_iv);
-        byte[] bs = GM.Sm4EncryptCBC(key, Hex.Decode(plainText), iv, GM.SM4_CBC_NOPADDING);
-        return Hex.ToHexString(bs);
-    }
-
-    /// <summary>
-    /// SM4解密（CBC）
-    /// </summary>
-    /// <param name="cipherText"></param>
-    /// <returns></returns>
-    public static string SM4DecryptCBC(string cipherText)
-    {
-        byte[] key = Hex.Decode(SM4_key);
-        byte[] iv = Hex.Decode(SM4_iv);
-        byte[] bs = GM.Sm4DecryptCBC(key, Hex.Decode(cipherText), iv, GM.SM4_CBC_NOPADDING);
-        return Encoding.UTF8.GetString(bs);
-    }
+// 麻省理工学院许可证
+//
+// 版权所有 (c) 2021-2023 zuohuaijun，大名科技（天津）有限公司  联系电话/微信：18020030720  QQ：515096995
+//
+// 特此免费授予获得本软件的任何人以处理本软件的权利，但须遵守以下条件：在所有副本或重要部分的软件中必须包括上述版权声明和本许可声明。
+//
+// 软件按“原样”提供，不提供任何形式的明示或暗示的保证，包括但不限于对适销性、适用性和非侵权的保证。
+// 在任何情况下，作者或版权持有人均不对任何索赔、损害或其他责任负责，无论是因合同、侵权或其他方式引起的，与软件或其使用或其他交易有关。
+
+using Org.BouncyCastle.Crypto;
+using Org.BouncyCastle.Math;
+using Org.BouncyCastle.Utilities.Encoders;
+
+namespace Admin.NET.Core;
+
+/// <summary>
+/// GM工具类
+/// </summary>
+public class GMUtil
+{
+
+    /// <summary>
+    /// SM2加密
+    /// </summary>
+    /// <param name="publicKeyHex"></param>
+    /// <param name="data_string"></param>
+    /// <returns></returns>
+    public static string SM2Encrypt(string publicKeyHex, string data_string)
+    {
+        // 如果是130位公钥，.NET使用的话，把开头的04截取掉
+        if (publicKeyHex.Length == 130)
+        {
+            publicKeyHex = publicKeyHex.Substring(2, 128);
+        }
+        // 公钥X，前64位
+        string x = publicKeyHex.Substring(0, 64);
+        // 公钥Y，后64位
+        string y = publicKeyHex.Substring(64);
+        // 获取公钥对象
+        AsymmetricKeyParameter publicKey1 = GM.GetPublickeyFromXY(new BigInteger(x, 16), new BigInteger(y, 16));
+        // Sm2Encrypt: C1C3C2
+        // Sm2EncryptOld: C1C2C3
+        byte[] digestByte = GM.Sm2Encrypt(Encoding.UTF8.GetBytes(data_string), publicKey1);
+        string strSM2 = Hex.ToHexString(digestByte);
+        return strSM2;
+    }
+
+    /// <summary>
+    /// SM2解密
+    /// </summary>
+    /// <param name="privateKey_string"></param>
+    /// <param name="encryptedData_string"></param>
+    /// <returns></returns>
+    public static string SM2Decrypt(string privateKey_string, string encryptedData_string)
+    {
+        if (!encryptedData_string.StartsWith("04"))
+            encryptedData_string = "04" + encryptedData_string;
+        BigInteger d = new(privateKey_string, 16);
+        // 先拿到私钥对象，用ECPrivateKeyParameters 或 AsymmetricKeyParameter 都可以
+        // ECPrivateKeyParameters bcecPrivateKey = GmUtil.GetPrivatekeyFromD(d);
+        AsymmetricKeyParameter bcecPrivateKey = GM.GetPrivatekeyFromD(d);
+        byte[] byToDecrypt = Hex.Decode(encryptedData_string);
+        byte[] byDecrypted = GM.Sm2Decrypt(byToDecrypt, bcecPrivateKey);
+        string strDecrypted = Encoding.UTF8.GetString(byDecrypted);
+        return strDecrypted;
+    }
+
+	/// <summary>
+	/// SM4加密（ECB）
+	/// </summary>
+	/// <param name="key_string"></param>
+	/// <param name="plainText"></param>
+	/// <returns></returns>
+	public static string SM4EncryptECB(string key_string,string plainText)
+    {
+        byte[] key = Hex.Decode(key_string);
+		byte[] bs = GM.Sm4EncryptECB(key, Encoding.UTF8.GetBytes(plainText), GM.SM4_CBC_PKCS7PADDING);//NoPadding 的情况下需要校验数据长度是16的倍数. 使用 HandleSm4Padding 处理
+		return Hex.ToHexString(bs);
+    }
+
+	/// <summary>
+	/// SM4解密（ECB）
+	/// </summary>
+	/// <param name="key_string"></param>
+	/// <param name="cipherText"></param>
+	/// <returns></returns>
+	public static string SM4DecryptECB(string key_string, string cipherText)
+    {
+        byte[] key = Hex.Decode(key_string);
+		byte[] bs = GM.Sm4DecryptECB(key, Hex.Decode(cipherText), GM.SM4_CBC_PKCS7PADDING);
+        return Encoding.UTF8.GetString(bs);
+    }
+
+	/// <summary>
+	/// SM4加密（CBC）
+	/// </summary>
+	/// <param name="key_string"></param>
+	/// <param name="iv_string"></param>
+	/// <param name="plainText"></param>
+	/// <returns></returns>
+	public static string SM4EncryptCBC(string key_string, string iv_string, string plainText)
+    {
+        byte[] key = Hex.Decode(key_string);
+        byte[] iv = Hex.Decode(iv_string);
+		byte[] bs = GM.Sm4EncryptCBC(key,Encoding.UTF8.GetBytes(plainText), iv, GM.SM4_CBC_PKCS7PADDING);
+		return Hex.ToHexString(bs);
+    }
+
+	/// <summary>
+	/// SM4解密（CBC）
+	/// </summary>
+	/// <param name="key_string"></param>
+	/// <param name="iv_string"></param>
+	/// <param name="cipherText"></param>
+	/// <returns></returns>
+	public static string SM4DecryptCBC(string key_string, string iv_string, string cipherText)
+    {
+		byte[] key = Hex.Decode(key_string);
+		byte[] iv = Hex.Decode(iv_string);
+		byte[] bs = GM.Sm4DecryptCBC(key, Hex.Decode(cipherText), iv, GM.SM4_CBC_PKCS7PADDING);
+        return Encoding.UTF8.GetString(bs);
+    }
+	/// <summary>
+	/// 补足 16 进制字符串的 0 字符，返回不带 0x 的16进制字符串
+	/// </summary>
+	/// <param name="input"></param>
+	/// <param name="mode">1表示加密，0表示解密</param>
+	/// <returns></returns>
+	private static byte[] HandleSm4Padding(byte[] input, int mode)
+	{
+		if (input == null)
+		{
+			return null;
+		}
+		byte[] ret = (byte[])null;
+		if (mode == 1)
+		{
+			int p = 16 - input.Length % 16;
+			ret = new byte[input.Length + p];
+			Array.Copy(input, 0, ret, 0, input.Length);
+			for (int i = 0; i < p; i++)
+			{
+				ret[input.Length + i] = (byte)p;
+			}
+		}
+		else
+		{
+			int p = input[input.Length - 1];
+			ret = new byte[input.Length - p];
+			Array.Copy(input, 0, ret, 0, input.Length - p);
+		}
+		return ret;
+	}
 }