From 08ba8dd5655e57eb2a3c932cae14c3d05eb8d935 Mon Sep 17 00:00:00 2001
From: "bin.liu" <bin.liu@aishu.cn>
Date: Thu, 13 Oct 2022 16:00:01 +0800
Subject: [PATCH] =?UTF-8?q?fix(sm4=5Fgcm):=20=E4=BF=AE=E5=A4=8DGHASH?=
 =?UTF-8?q?=E9=80=BB=E8=BE=91=E9=94=99=E8=AF=AF=E9=80=A0=E6=88=90GCM?=
 =?UTF-8?q?=E6=A8=A1=E5=BC=8F=E4=B8=8Btag=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sm4/sm4_gcm.go      |   4 +-
 sm4/sm4_gcm_test.go | 110 +++++++++++++++++++++++++++++++++++++++++++-
 2 files changed, 111 insertions(+), 3 deletions(-)

diff --git a/sm4/sm4_gcm.go b/sm4/sm4_gcm.go
index a5d531d3..afbc91b1 100644
--- a/sm4/sm4_gcm.go
+++ b/sm4/sm4_gcm.go
@@ -184,8 +184,8 @@ func GHASH(H []byte, A []byte, C []byte) (X []byte) {
 		data[7] = byte((len >> 0) & 0xff)
 		return data
 	}
-	lenAB = append(lenAB, calculateLenToBytes(len(A))...)
-	lenAB = append(lenAB, calculateLenToBytes(len(C))...)
+	lenAB = append(lenAB, calculateLenToBytes(len(A)<<3)...)
+	lenAB = append(lenAB, calculateLenToBytes(len(C)<<3)...)
 	copy(X[(m+n+1)*BlockSize:(m+n+1)*BlockSize+BlockSize], multiplication(addition(X[(m+n)*BlockSize:(m+n)*BlockSize+BlockSize], lenAB), H))
 	return X[(m+n+1)*BlockSize : (m+n+1)*BlockSize+BlockSize]
 }
diff --git a/sm4/sm4_gcm_test.go b/sm4/sm4_gcm_test.go
index a5e0900c..1ed89209 100644
--- a/sm4/sm4_gcm_test.go
+++ b/sm4/sm4_gcm_test.go
@@ -19,6 +19,7 @@ package sm4
 
 import (
 	"bytes"
+	"encoding/hex"
 	"fmt"
 	"testing"
 )
@@ -58,4 +59,111 @@ func TestSM4GCM(t *testing.T){
 		}
 	}
 
-}
\ No newline at end of file
+}
+
+func TestGHASH(t *testing.T) {
+	type args struct {
+		hHex string
+		aHex string
+		cHex string
+	}
+	tests := []struct {
+		name       string
+		args       args
+		wantOutHex string
+	}{
+		{
+			name: "ok1",
+			args: args{
+				hHex: "66e94bd4ef8a2c3b884cfa59ca342b2e",
+				aHex: "",
+				cHex: "",
+			},
+			wantOutHex: "00000000000000000000000000000000",
+		},
+		{
+			name: "ok2",
+			args: args{
+				hHex: "66e94bd4ef8a2c3b884cfa59ca342b2e",
+				aHex: "",
+				cHex: "0388dace60b6a392f328c2b971b2fe78",
+			},
+			wantOutHex: "f38cbb1ad69223dcc3457ae5b6b0f885",
+		},
+		{
+			name: "ok3",
+			args: args{
+				hHex: "b83b533708bf535d0aa6e52980d53b78",
+				aHex: "",
+				cHex: "42831ec2217774244b7221b784d0d49c" +
+					"e3aa212f2c02a4e035c17e2329aca12e" +
+					"21d514b25466931c7d8f6a5aac84aa05" +
+					"1ba30b396a0aac973d58e091473f5985",
+			},
+			wantOutHex: "7f1b32b81b820d02614f8895ac1d4eac",
+		},
+		{
+			name: "ok4",
+			args: args{
+				hHex: "b83b533708bf535d0aa6e52980d53b78",
+				aHex: "feedfacedeadbeeffeedfacedeadbeef" +
+					"abaddad2",
+				cHex: "42831ec2217774244b7221b784d0d49c" +
+					"e3aa212f2c02a4e035c17e2329aca12e" +
+					"21d514b25466931c7d8f6a5aac84aa05" +
+					"1ba30b396a0aac973d58e091",
+			},
+			wantOutHex: "698e57f70e6ecc7fd9463b7260a9ae5f",
+		},
+		{
+			name: "ok5",
+			args: args{
+				hHex: "b83b533708bf535d0aa6e52980d53b78",
+				aHex: "feedfacedeadbeeffeedfacedeadbeef" +
+					"abaddad2",
+				cHex: "61353b4c2806934a777ff51fa22a4755" +
+					"699b2a714fcdc6f83766e5f97b6c7423" +
+					"73806900e49f24b22b097544d4896b42" +
+					"4989b5e1ebac0f07c23f4598",
+			},
+			wantOutHex: "df586bb4c249b92cb6922877e444d37b",
+		},
+		{
+			name: "ok6",
+			args: args{
+				hHex: "b83b533708bf535d0aa6e52980d53b78",
+				aHex: "feedfacedeadbeeffeedfacedeadbeef" +
+					"abaddad2",
+				cHex: "8ce24998625615b603a033aca13fb894" +
+					"be9112a5c3a211a8ba262a3cca7e2ca7" +
+					"01e4a9a4fba43c90ccdcb281d48c7c6f" +
+					"d62875d2aca417034c34aee5",
+			},
+			wantOutHex: "1c5afe9760d3932f3c9a878aac3dc3de",
+		},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			h, err := hex.DecodeString(tt.args.hHex)
+			if err != nil {
+				t.Errorf("GHash() error = %v, wrong h", err)
+				return
+			}
+			a, err := hex.DecodeString(tt.args.aHex)
+			if err != nil {
+				t.Errorf("GHash() error = %v, wrong a", err)
+				return
+			}
+			c, err := hex.DecodeString(tt.args.cHex)
+			if err != nil {
+				t.Errorf("GHash() error = %v, wrong c", err)
+				return
+			}
+			gotOut := GHASH(h, a, c)
+			gotOutStr := hex.EncodeToString(gotOut)
+			if gotOutStr != tt.wantOutHex {
+				t.Errorf("GHash() gotOut = %v, want %v", gotOutStr, tt.wantOutHex)
+			}
+		})
+	}
+}