diff --git a/pkg/transport/tls.go b/pkg/transport/tls.go index 5bc75921..e13374c6 100644 --- a/pkg/transport/tls.go +++ b/pkg/transport/tls.go @@ -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 }