Package Socket:

- client: fix TLS config for client
nabbar · Sep 6, 2024 · 102d163 · 102d163
1 parent 556cb36
commit 102d163
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 8 deletions.
diff --git a/socket/client/tcp/model.go b/socket/client/tcp/model.go
@@ -54,7 +54,7 @@ type cli struct {
 	c *atomic.Value // net.Conn
 }
 
-func (o *cli) SetTLS(enable bool, config libtls.TLSConfig) error {
+func (o *cli) SetTLS(enable bool, config libtls.TLSConfig, serverName string) error {
 	if !enable {
 		// #nosec
 		o.t.Store(&tlsCfg{
@@ -66,9 +66,7 @@ func (o *cli) SetTLS(enable bool, config libtls.TLSConfig) error {
 
 	if config == nil {
 		return fmt.Errorf("invalid tls config")
-	} else if l := config.GetCertificatePair(); len(l) < 1 {
-		return fmt.Errorf("invalid tls config, missing certificates pair")
-	} else if t := config.TlsConfig(""); t == nil {
+	} else if t := config.TlsConfig(serverName); t == nil {
 		return fmt.Errorf("invalid tls config")
 	} else {
 		o.t.Store(&tlsCfg{

diff --git a/socket/client/udp/model.go b/socket/client/udp/model.go
@@ -45,7 +45,7 @@ type cli struct {
 	c *atomic.Value // net.Conn
 }
 
-func (o *cli) SetTLS(enable bool, config libtls.TLSConfig) error {
+func (o *cli) SetTLS(enable bool, config libtls.TLSConfig, serverName string) error {
 	return nil
 }
 

diff --git a/socket/client/unix/model.go b/socket/client/unix/model.go
@@ -48,7 +48,7 @@ type cli struct {
 	c *atomic.Value // net.Conn
 }
 
-func (o *cli) SetTLS(enable bool, config libtls.TLSConfig) error {
+func (o *cli) SetTLS(enable bool, config libtls.TLSConfig, serverName string) error {
 	return nil
 }
 

diff --git a/socket/client/unixgram/model.go b/socket/client/unixgram/model.go
@@ -48,7 +48,7 @@ type cli struct {
 	c *atomic.Value // net.Conn
 }
 
-func (o *cli) SetTLS(enable bool, config libtls.TLSConfig) error {
+func (o *cli) SetTLS(enable bool, config libtls.TLSConfig, serverName string) error {
 	return nil
 }
 

diff --git a/socket/interface.go b/socket/interface.go
@@ -143,7 +143,7 @@ type Server interface {
 type Client interface {
 	io.ReadWriteCloser
 
-	SetTLS(enable bool, config libtls.TLSConfig) error
+	SetTLS(enable bool, config libtls.TLSConfig, serverName string) error
 
 	// RegisterFuncError registers a FuncError used to process errors during running process
 	// f FuncError