From fe1f7c14b4f8506c746714aa330af90b8ca86029 Mon Sep 17 00:00:00 2001
From: cheney <qian.huang@sunyard.com>
Date: Wed, 15 Apr 2026 17:34:25 +0800
Subject: [PATCH] =?UTF-8?q?web=20=E7=AB=AF=20sm4=20=E9=AA=8C=E8=AF=81?=
 =?UTF-8?q?=E6=AD=A3=E7=A1=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/App.tsx                             | 20 ++++++++++++++++++--
 src/__tests__/algorithm/sm4-gcm.test.ts | 22 ++++++++++++++++++++++
 src/__tests__/algorithm/sm4.test.ts     |  1 +
 src/utils/algorithm/sm4.ts              | 12 +++++++-----
 test-gcm.js                             | 21 +++++++++++++++++++++
 5 files changed, 69 insertions(+), 7 deletions(-)
 create mode 100644 src/__tests__/algorithm/sm4-gcm.test.ts
 create mode 100644 test-gcm.js

diff --git a/src/App.tsx b/src/App.tsx
index 2542046..011ee7e 100644
--- a/src/App.tsx
+++ b/src/App.tsx
@@ -25,6 +25,7 @@ function App() {
   const [sm4Iv, setSm4Iv] = useState('')
   const [sm4Message, setSm4Message] = useState('')
   const [sm4Mode, setSm4Mode] = useState('ecb')
+  const [sm4PaddingMode, setSm4PaddingMode] = useState<'pkcs7' | 'none'>('pkcs7')
   const [sm4Encrypted, setSm4Encrypted] = useState('')
   const [sm4Decrypted, setSm4Decrypted] = useState('')
   
@@ -116,7 +117,7 @@ function App() {
   // SM4 加密
   const handleEncryptSm4 = () => {
     try {
-      const encrypted = sm4Encrypt(sm4Message, sm4Key, sm4Mode, sm4Iv)
+      const encrypted = sm4Encrypt(sm4Message, sm4Key, sm4Mode, sm4Iv, sm4PaddingMode)
       setSm4Encrypted(encrypted)
     } catch (error) {
       alert('加密失败: ' + (error instanceof Error ? error.message : error))
@@ -126,7 +127,7 @@ function App() {
   // SM4 解密
   const handleDecryptSm4 = () => {
     try {
-      const decrypted = sm4Decrypt(sm4Encrypted, sm4Key, sm4Mode, sm4Iv)
+      const decrypted = sm4Decrypt(sm4Encrypted, sm4Key, sm4Mode, sm4Iv, sm4PaddingMode)
       setSm4Decrypted(decrypted)
     } catch (error) {
       alert('解密失败: ' + (error instanceof Error ? error.message : error))
@@ -347,6 +348,21 @@ function App() {
             </div>
           </div>
           
+          <div className="form-group">
+            <label>填充模式</label>
+            <div style={{ display: 'flex', gap: '0.5rem', flexWrap: 'wrap' }}>
+              {(['pkcs7', 'none'] as const).map(paddingMode => (
+                <button 
+                  key={paddingMode} 
+                  className={sm4PaddingMode === paddingMode ? 'primary' : ''}
+                  onClick={() => setSm4PaddingMode(paddingMode)}
+                >
+                  {paddingMode}
+                </button>
+              ))}
+            </div>
+          </div>
+          
           <div className="form-group">
             <label>消息</label>
             <textarea 
diff --git a/src/__tests__/algorithm/sm4-gcm.test.ts b/src/__tests__/algorithm/sm4-gcm.test.ts
new file mode 100644
index 0000000..cca37c5
--- /dev/null
+++ b/src/__tests__/algorithm/sm4-gcm.test.ts
@@ -0,0 +1,22 @@
+import { sm4Encrypt, sm4Decrypt } from '../../utils/algorithm/sm4'
+
+describe('SM4 GCM 模式测试（用户提供的测试用例）', () => {
+  test('用户提供的 GCM 测试用例', () => {
+    const key = '00000000000000000000000000000000'
+    const iv = '000000000000000000000000'
+    const message = '00000000000000000000000000000000'
+    const expected = '7de2aa7f1110188218063be1bfeb6d89b851b5f39493752be508f1bb4482c557'
+    
+    const encrypted = sm4Encrypt(message, key, 'gcm', iv, 'none')
+    console.log('实际结果:', encrypted)
+    console.log('预期结果:', expected)
+    console.log('结果是否匹配:', encrypted.toUpperCase() === expected.toUpperCase())
+    
+    // 验证加密结果
+    expect(encrypted.toUpperCase()).toBe(expected.toUpperCase())
+    
+    // 验证解密结果
+    const decrypted = sm4Decrypt(encrypted, key, 'gcm', iv, 'none')
+    expect(decrypted.toUpperCase()).toBe(message.toUpperCase())
+  })
+})
\ No newline at end of file
diff --git a/src/__tests__/algorithm/sm4.test.ts b/src/__tests__/algorithm/sm4.test.ts
index da81f7f..8def0c2 100644
--- a/src/__tests__/algorithm/sm4.test.ts
+++ b/src/__tests__/algorithm/sm4.test.ts
@@ -139,3 +139,4 @@ describe('SM4 算法测试', () => {
     }
   })
 })
+
diff --git a/src/utils/algorithm/sm4.ts b/src/utils/algorithm/sm4.ts
index 3d47e0c..8df1475 100644
--- a/src/utils/algorithm/sm4.ts
+++ b/src/utils/algorithm/sm4.ts
@@ -122,18 +122,19 @@ export const sm4Encrypt = (message: string, key: string, mode: string, iv?: stri
     const ivBytes = hexToBytes(iv)
     const ivBits = sjcl.codec.bytes.toBits(ivBytes)
     const dataBits = sjcl.codec.bytes.toBits(dataToEncrypt)
-    const encryptedResult = sjcl.mode.gcm.encrypt(sm4Key, dataBits, ivBits, sjcl.codec.bytes.toBits([]))
-    // GCM 模式返回的数据包含 tag，需要分离
+    // 传递标签长度参数（128 位）
+    const encryptedResult = sjcl.mode.gcm.encrypt(sm4Key, dataBits, ivBits, sjcl.codec.bytes.toBits([]), 128)
+    // GCM 模式返回的数据包含 tag
     if (!encryptedResult) {
       throw new Error('GCM encryption failed: result is undefined')
     }
     // 检查 encryptedResult 的类型
     if (Array.isArray(encryptedResult)) {
-      // 如果返回的是数组，直接使用
+      // 如果返回的是数组，直接使用（包含了 tag）
       const encryptedBytes = sjcl.codec.bytes.fromBits(encryptedResult)
       return bytesToHex(encryptedBytes)
     } else if (encryptedResult.data) {
-      // 如果返回的是对象，使用 data 属性
+      // 如果返回的是对象，使用 data 属性（可能已经包含了 tag）
       const encryptedBits = encryptedResult.data
       const encryptedBytes = sjcl.codec.bytes.fromBits(encryptedBits)
       return bytesToHex(encryptedBytes)
@@ -208,7 +209,8 @@ export const sm4Decrypt = (encrypted: string, key: string, mode: string, iv?: st
     const ivBytes = hexToBytes(iv)
     const ivBits = sjcl.codec.bytes.toBits(ivBytes)
     const encryptedBits = sjcl.codec.bytes.toBits(encryptedBytes)
-    const decryptedResult = sjcl.mode.gcm.decrypt(sm4Key, encryptedBits, ivBits, sjcl.codec.bytes.toBits([]))
+    // 传递标签长度参数（128 位）
+    const decryptedResult = sjcl.mode.gcm.decrypt(sm4Key, encryptedBits, ivBits, sjcl.codec.bytes.toBits([]), 128)
     // 检查 decryptedResult 的类型
     if (!decryptedResult) {
       throw new Error('GCM decryption failed: result is undefined')
diff --git a/test-gcm.js b/test-gcm.js
new file mode 100644
index 0000000..f43fa43
--- /dev/null
+++ b/test-gcm.js
@@ -0,0 +1,21 @@
+import { sm4Encrypt } from './src/utils/algorithm/sm4.ts';
+
+// 用户提供的测试用例
+const key = '00000000000000000000000000000000';
+const iv = '000000000000000000000000';
+const message = '00000000000000000000000000000000';
+const expected = '7de2aa7f1110188218063be1bfeb6d89b851b5f39493752be508f1bb4482c557';
+
+console.log('测试 SM4 GCM 模式...');
+console.log('密钥:', key);
+console.log('IV:', iv);
+console.log('消息:', message);
+console.log('预期结果:', expected);
+
+try {
+  const result = sm4Encrypt(message, key, 'gcm', iv, 'none');
+  console.log('实际结果:', result);
+  console.log('结果是否匹配:', result.toUpperCase() === expected.toUpperCase());
+} catch (error) {
+  console.error('错误:', error.message);
+}