andre/mihomo
1
0
Fork 0
mirror of https://github.com/MetaCubeX/mihomo.git synced 2026-03-14 14:09:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: cleanup tls clientFingerprint code

Browse Source
This commit is contained in:
wwqgtxx
2025-04-29 21:15:48 +08:00
parent 936df90ace
commit ee5d77cfd1
8 changed files with 193 additions and 116 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -10,7 +10,6 @@ import (
"github.com/metacubex/mihomo/log"
"github.com/metacubex/sing-shadowtls"
utls "github.com/metacubex/utls"
"golang.org/x/exp/slices"
)
@@ -67,26 +66,21 @@ func uTLSHandshakeFunc(config *tls.Config, clientFingerprint string) shadowtls.T
return func(ctx context.Context, conn net.Conn, sessionIDGenerator shadowtls.TLSSessionIDGeneratorFunc) error {
tlsConfig := tlsC.UConfig(config)
tlsConfig.SessionIDGenerator = sessionIDGenerator
clientFingerprint := clientFingerprint
if tlsC.HaveGlobalFingerprint() && len(clientFingerprint) == 0 {
clientFingerprint = tlsC.GetGlobalFingerprint()
}
if config.MaxVersion == tls.VersionTLS12 { // for ShadowTLS v1
clientFingerprint = ""
tlsConn := tlsC.Client(conn, tlsConfig)
return tlsConn.HandshakeContext(ctx)
}
if len(clientFingerprint) != 0 {
if fingerprint, exists := tlsC.GetFingerprint(clientFingerprint); exists {
tlsConn := tlsC.UClient(conn, tlsConfig, fingerprint)
if slices.Equal(tlsConfig.NextProtos, WsALPN) {
err := tlsC.BuildWebsocketHandshakeState(tlsConn)
if err != nil {
return err
}
if clientFingerprint, ok := tlsC.GetFingerprint(clientFingerprint); ok {
tlsConn := tlsC.UClient(conn, tlsConfig, clientFingerprint)
if slices.Equal(tlsConfig.NextProtos, WsALPN) {
err := tlsC.BuildWebsocketHandshakeState(tlsConn)
if err != nil {
return err
}
return tlsConn.HandshakeContext(ctx)
}
return tlsConn.HandshakeContext(ctx)
}
tlsConn := utls.Client(conn, tlsConfig)
tlsConn := tlsC.Client(conn, tlsConfig)
return tlsConn.HandshakeContext(ctx)
}
}