mirror/mihomo
1
1
Fork 0
mirror of https://github.com/MetaCubeX/mihomo.git synced 2025-12-19 16:30:07 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

fix: shadowtls v2 not work with X25519MLKEM768

Browse Source
This commit is contained in:
wwqgtxx 2025-05-18 00:50:00 +08:00
parent 1672750c47
commit d900c71214
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
transport/sing-shadowtls/shadowtls.go
View File

@ -49,7 +49,7 @@ func NewShadowTLS(ctx context.Context, conn net.Conn, option *ShadowTLSOption) (
return nil, err return nil, err
} }
tlsHandshake := uTLSHandshakeFunc(tlsConfig, option.ClientFingerprint) tlsHandshake := uTLSHandshakeFunc(tlsConfig, option.ClientFingerprint, option.Version)
client, err := shadowtls.NewClient(shadowtls.ClientConfig{ client, err := shadowtls.NewClient(shadowtls.ClientConfig{
Version: option.Version, Version: option.Version,
Password: option.Password, Password: option.Password,
@ -62,15 +62,19 @@ func NewShadowTLS(ctx context.Context, conn net.Conn, option *ShadowTLSOption) (
return client.DialContextConn(ctx, conn) return client.DialContextConn(ctx, conn)
} }
func uTLSHandshakeFunc(config *tls.Config, clientFingerprint string) shadowtls.TLSHandshakeFunc { func uTLSHandshakeFunc(config *tls.Config, clientFingerprint string, version int) shadowtls.TLSHandshakeFunc {
return func(ctx context.Context, conn net.Conn, sessionIDGenerator shadowtls.TLSSessionIDGeneratorFunc) error { return func(ctx context.Context, conn net.Conn, sessionIDGenerator shadowtls.TLSSessionIDGeneratorFunc) error {
tlsConfig := tlsC.UConfig(config) tlsConfig := tlsC.UConfig(config)
tlsConfig.SessionIDGenerator = sessionIDGenerator tlsConfig.SessionIDGenerator = sessionIDGenerator
if config.MaxVersion == tls.VersionTLS12 { // for ShadowTLS v1 if version == 1 {
tlsConfig.MaxVersion = tlsC.VersionTLS12 // ShadowTLS v1 only support TLS 1.2
tlsConn := tlsC.Client(conn, tlsConfig) tlsConn := tlsC.Client(conn, tlsConfig)
return tlsConn.HandshakeContext(ctx) return tlsConn.HandshakeContext(ctx)
} }
if clientFingerprint, ok := tlsC.GetFingerprint(clientFingerprint); ok { if clientFingerprint, ok := tlsC.GetFingerprint(clientFingerprint); ok {
if version == 2 && clientFingerprint == tlsC.HelloChrome_Auto {
clientFingerprint = tlsC.HelloChrome_120 // ShadowTLS v2 not work with X25519MLKEM768
}
tlsConn := tlsC.UClient(conn, tlsConfig, clientFingerprint) tlsConn := tlsC.UClient(conn, tlsConfig, clientFingerprint)
if slices.Equal(tlsConfig.NextProtos, WsALPN) { if slices.Equal(tlsConfig.NextProtos, WsALPN) {
err := tlsC.BuildWebsocketHandshakeState(tlsConn) err := tlsC.BuildWebsocketHandshakeState(tlsConn)