Merge pull request #22 from emmansun/main

处理mutual_auth_spec example证书过期
Trisia · Oct 26, 2023 · 8bd1797 · 8bd1797
2 parents 91ad98f + 0994296
commit 8bd1797
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 5 deletions.
diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml
@@ -13,13 +13,16 @@ jobs:
 
   build:
     runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        goVer: ['1.16', '1.19', '1.21']    
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
 
     - name: Set up Go
-      uses: actions/setup-go@v3
+      uses: actions/setup-go@v4
       with:
-        go-version: 1.16
+        go-version: ${{ matrix.goVer }}
 
     - name: Tidy
       run: |

diff --git a/example/client/mutual_auth_spec/ecdhe/main.go b/example/client/mutual_auth_spec/ecdhe/main.go
@@ -2,10 +2,18 @@ package main
 
 import (
 	"fmt"
+	"time"
+
 	"gitee.com/Trisia/gotlcp/tlcp"
 	"github.com/emmansun/gmsm/smx509"
 )
 
+// 测试时服务器时间，防止证书过期
+func runtimeTime() time.Time {
+	res, _ := time.Parse("2006-01-02 15:04:05", "2023-03-15 00:00:00")
+	return res
+}
+
 // 客户端双向身份认证
 func main() {
 	loadCert()
@@ -22,6 +30,8 @@ func main() {
 			tlcp.ECDHE_SM4_CBC_SM3,
 			// 注意：不能出现 ECC 系列套件，否则服务端可能选择ECC系列套件。
 		},
+		Time: runtimeTime,
+		EnableDebug: true,
 	}
 	//// 兼容向量模式的密钥交换参数
 	//config.ClientECDHEParamsAsVector = true

diff --git a/example/server/mutual_auth_spec/main.go b/example/server/mutual_auth_spec/main.go
@@ -1,12 +1,20 @@
 package main
 
 import (
-	"gitee.com/Trisia/gotlcp/tlcp"
-	"github.com/emmansun/gmsm/smx509"
 	"io"
 	"net"
+	"time"
+
+	"gitee.com/Trisia/gotlcp/tlcp"
+	"github.com/emmansun/gmsm/smx509"
 )
 
+// 测试时服务器时间，防止证书过期
+func runtimeTime() time.Time {
+	res, _ := time.Parse("2006-01-02 15:04:05", "2023-03-15 00:00:00")
+	return res
+}
+
 // 服务端双向身份认证
 func main() {
 	loadCert()
@@ -20,6 +28,8 @@ func main() {
 			tlcp.ECDHE_SM4_GCM_SM3, // 最高优先级
 			tlcp.ECC_SM4_CBC_SM3,   // 最低优先级
 		},
+		Time:        runtimeTime,
+		EnableDebug: true,
 	}
 	listen, err := tlcp.Listen("tcp", ":8450", config)
 	if err != nil {