XiaoMo/frp
1
0
Fork 0
mirror of https://github.com/fatedier/frp.git synced 2025-05-13 18:58:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge f7e3b951b51c9a2a848a47154c68383fb9b6d35d into a5b7abfc8b24491a60fb72369b9e980791f63dd7

Browse Source
This commit is contained in:
zgh419566 2024-03-12 19:05:14 +08:00 committed by GitHub
commit e4cdae837f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 50 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
pkg/transport/tls.go
View File

@ -95,6 +95,31 @@ func NewServerTLSConfig(certPath, keyPath, caPath string) (*tls.Config, error) {
base.ClientAuth = tls.RequireAndVerifyClientCert
base.ClientCAs = pool
//20240206 TLS CVE-2016-2183 bye zgh419566
base.MinVersion = tls.VersionTLS12
base.PreferServerCipherSuites = true
base.CipherSuites = []uint16{
//tls.TLS_AES_128_GCM_SHA256,
//tls.TLS_CHACHA20_POLY1305_SHA256,
//tls.TLS_AES_256_GCM_SHA384,
//tls.TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305,
//tls.TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305,
//tls.TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,
//tls.TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256,
//tls.TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384,
//tls.TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384,
//tls.TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256,
//tls.TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA,
//tls.TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA256,
//tls.TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA,
//tls.TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA,
//tls.TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA,
tls.TLS_RSA_WITH_AES_128_GCM_SHA256,
tls.TLS_RSA_WITH_AES_256_GCM_SHA384,
tls.TLS_RSA_WITH_AES_128_CBC_SHA,
tls.TLS_RSA_WITH_AES_256_CBC_SHA,
}
}
return base, nil
@ -122,6 +147,31 @@ func NewClientTLSConfig(certPath, keyPath, caPath, serverName string) (*tls.Conf
base.RootCAs = pool
base.InsecureSkipVerify = false
//20240206 TLS CVE-2016-2183 by zgh419566
base.PreferServerCipherSuites = false
base.MinVersion = tls.VersionTLS12
base.CipherSuites = []uint16{
//tls.TLS_AES_128_GCM_SHA256,
//tls.TLS_CHACHA20_POLY1305_SHA256,
//tls.TLS_AES_256_GCM_SHA384,
//tls.TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305,
//tls.TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305,
//tls.TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,
//tls.TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256,
//tls.TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384,
//tls.TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384,
//tls.TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256,
//tls.TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA,
//tls.TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA256,
//tls.TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA,
//tls.TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA,
//tls.TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA,
tls.TLS_RSA_WITH_AES_128_GCM_SHA256,
tls.TLS_RSA_WITH_AES_256_GCM_SHA384,
tls.TLS_RSA_WITH_AES_128_CBC_SHA,
tls.TLS_RSA_WITH_AES_256_CBC_SHA,
}
} else {
base.InsecureSkipVerify = true
}