Update usages of TLS config

nekohasekai · nekohasekai · commit da23407a63d5 · 2025-09-09T18:09:20.000+08:00
diff --git a/go.mod b/go.mod
@@ -5,7 +5,7 @@ go 1.23.0
 require (
 	github.com/gofrs/uuid/v5 v5.3.2
 	github.com/sagernet/quic-go v0.52.0-beta.1
-	github.com/sagernet/sing v0.7.7
+	github.com/sagernet/sing v0.7.8-0.20250908020855-05122169f96d
 	golang.org/x/crypto v0.37.0
 	golang.org/x/exp v0.0.0-20240506185415-9bf2ced13842
 )
diff --git a/go.sum b/go.sum
@@ -8,8 +8,8 @@ github.com/quic-go/qpack v0.5.1 h1:giqksBPnT/HDtZ6VhtFKgoLOWmlyo9Ei6u9PqzIMbhI=
 github.com/quic-go/qpack v0.5.1/go.mod h1:+PC4XFrEskIVkcLzpEkbLqq1uCoxPhQuvK5rH1ZgaEg=
 github.com/sagernet/quic-go v0.52.0-beta.1 h1:hWkojLg64zjV+MJOvJU/kOeWndm3tiEfBLx5foisszs=
 github.com/sagernet/quic-go v0.52.0-beta.1/go.mod h1:OV+V5kEBb8kJS7k29MzDu6oj9GyMc7HA07sE1tedxz4=
-github.com/sagernet/sing v0.7.7 h1:o46FzVZS+wKbBMEkMEdEHoVZxyM9jvfRpKXc7pEgS/c=
-github.com/sagernet/sing v0.7.7/go.mod h1:ARkL0gM13/Iv5VCZmci/NuoOlePoIsW0m7BWfln/Hak=
+github.com/sagernet/sing v0.7.8-0.20250908020855-05122169f96d h1:WLvosqu1YYjyqEVTfUTR3HtEF09X9B8in4LH2HDopdY=
+github.com/sagernet/sing v0.7.8-0.20250908020855-05122169f96d/go.mod h1:ARkL0gM13/Iv5VCZmci/NuoOlePoIsW0m7BWfln/Hak=
 github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=
 github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
 golang.org/x/crypto v0.37.0 h1:kJNSjF/Xp7kU0iB2Z+9viTPMW4EqqsrywMXLJOOsXSE=
diff --git a/quic.go b/quic.go
@@ -40,7 +40,7 @@ func Dial(ctx context.Context, conn net.PacketConn, addr net.Addr, config aTLS.C
 	if quicTLSConfig, isQUICConfig := config.(Config); isQUICConfig {
 		return quicTLSConfig.Dial(ctx, conn, addr, quicConfig)
 	}
-	tlsConfig, err := config.Config()
+	tlsConfig, err := config.STDConfig()
 	if err != nil {
 		return nil, err
 	}
@@ -51,7 +51,7 @@ func DialEarly(ctx context.Context, conn net.PacketConn, addr net.Addr, config a
 	if quicTLSConfig, isQUICConfig := config.(Config); isQUICConfig {
 		return quicTLSConfig.DialEarly(ctx, conn, addr, quicConfig)
 	}
-	tlsConfig, err := config.Config()
+	tlsConfig, err := config.STDConfig()
 	if err != nil {
 		return nil, err
 	}
@@ -62,7 +62,7 @@ func CreateTransport(conn net.PacketConn, quicConnPtr *quic.EarlyConnection, ser
 	if quicTLSConfig, isQUICConfig := config.(Config); isQUICConfig {
 		return quicTLSConfig.CreateTransport(conn, quicConnPtr, serverAddr, quicConfig), nil
 	}
-	tlsConfig, err := config.Config()
+	tlsConfig, err := config.STDConfig()
 	if err != nil {
 		return nil, err
 	}
@@ -84,7 +84,7 @@ func Listen(conn net.PacketConn, config aTLS.ServerConfig, quicConfig *quic.Conf
 	if quicTLSConfig, isQUICConfig := config.(ServerConfig); isQUICConfig {
 		return quicTLSConfig.Listen(conn, quicConfig)
 	}
-	tlsConfig, err := config.Config()
+	tlsConfig, err := config.STDConfig()
 	if err != nil {
 		return nil, err
 	}
@@ -95,7 +95,7 @@ func ListenEarly(conn net.PacketConn, config aTLS.ServerConfig, quicConfig *quic
 	if quicTLSConfig, isQUICConfig := config.(ServerConfig); isQUICConfig {
 		return quicTLSConfig.ListenEarly(conn, quicConfig)
 	}
-	tlsConfig, err := config.Config()
+	tlsConfig, err := config.STDConfig()
 	if err != nil {
 		return nil, err
 	}
@@ -110,7 +110,7 @@ func ConfigureHTTP3(config aTLS.ServerConfig) error {
 		quicTLSConfig.ConfigureHTTP3()
 		return nil
 	}
-	tlsConfig, err := config.Config()
+	tlsConfig, err := config.STDConfig()
 	if err != nil {
 		return err
 	}

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ go 1.23.0`
`5`	`5`	`require (`
`6`	`6`	`github.com/gofrs/uuid/v5 v5.3.2`
`7`	`7`	`github.com/sagernet/quic-go v0.52.0-beta.1`
`8`		`- github.com/sagernet/sing v0.7.7`
	`8`	`+ github.com/sagernet/sing v0.7.8-0.20250908020855-05122169f96d`
`9`	`9`	`golang.org/x/crypto v0.37.0`
`10`	`10`	`golang.org/x/exp v0.0.0-20240506185415-9bf2ced13842`
`11`	`11`	`)`
Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ func Dial(ctx context.Context, conn net.PacketConn, addr net.Addr, config aTLS.C`
`40`	`40`	`if quicTLSConfig, isQUICConfig := config.(Config); isQUICConfig {`
`41`	`41`	`return quicTLSConfig.Dial(ctx, conn, addr, quicConfig)`
`42`	`42`	`}`
`43`		`- tlsConfig, err := config.Config()`
	`43`	`+ tlsConfig, err := config.STDConfig()`
`44`	`44`	`if err != nil {`
`45`	`45`	`return nil, err`
`46`	`46`	`}`
`@@ -51,7 +51,7 @@ func DialEarly(ctx context.Context, conn net.PacketConn, addr net.Addr, config a`
`51`	`51`	`if quicTLSConfig, isQUICConfig := config.(Config); isQUICConfig {`
`52`	`52`	`return quicTLSConfig.DialEarly(ctx, conn, addr, quicConfig)`
`53`	`53`	`}`
`54`		`- tlsConfig, err := config.Config()`
	`54`	`+ tlsConfig, err := config.STDConfig()`
`55`	`55`	`if err != nil {`
`56`	`56`	`return nil, err`
`57`	`57`	`}`
`@@ -62,7 +62,7 @@ func CreateTransport(conn net.PacketConn, quicConnPtr *quic.EarlyConnection, ser`
`62`	`62`	`if quicTLSConfig, isQUICConfig := config.(Config); isQUICConfig {`
`63`	`63`	`return quicTLSConfig.CreateTransport(conn, quicConnPtr, serverAddr, quicConfig), nil`
`64`	`64`	`}`
`65`		`- tlsConfig, err := config.Config()`
	`65`	`+ tlsConfig, err := config.STDConfig()`
`66`	`66`	`if err != nil {`
`67`	`67`	`return nil, err`
`68`	`68`	`}`
`@@ -84,7 +84,7 @@ func Listen(conn net.PacketConn, config aTLS.ServerConfig, quicConfig *quic.Conf`
`84`	`84`	`if quicTLSConfig, isQUICConfig := config.(ServerConfig); isQUICConfig {`
`85`	`85`	`return quicTLSConfig.Listen(conn, quicConfig)`
`86`	`86`	`}`
`87`		`- tlsConfig, err := config.Config()`
	`87`	`+ tlsConfig, err := config.STDConfig()`
`88`	`88`	`if err != nil {`
`89`	`89`	`return nil, err`
`90`	`90`	`}`
`@@ -95,7 +95,7 @@ func ListenEarly(conn net.PacketConn, config aTLS.ServerConfig, quicConfig *quic`
`95`	`95`	`if quicTLSConfig, isQUICConfig := config.(ServerConfig); isQUICConfig {`
`96`	`96`	`return quicTLSConfig.ListenEarly(conn, quicConfig)`
`97`	`97`	`}`
`98`		`- tlsConfig, err := config.Config()`
	`98`	`+ tlsConfig, err := config.STDConfig()`
`99`	`99`	`if err != nil {`
`100`	`100`	`return nil, err`
`101`	`101`	`}`
`@@ -110,7 +110,7 @@ func ConfigureHTTP3(config aTLS.ServerConfig) error {`
`110`	`110`	`quicTLSConfig.ConfigureHTTP3()`
`111`	`111`	`return nil`
`112`	`112`	`}`
`113`		`- tlsConfig, err := config.Config()`
	`113`	`+ tlsConfig, err := config.STDConfig()`
`114`	`114`	`if err != nil {`
`115`	`115`	`return err`
`116`	`116`	`}`