Mirroristas/etcd
2
0
Fork 0
mirror of https://github.com/etcd-io/etcd.git synced 2024-09-27 06:25:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #14500 from dusk125/release-3.5

Browse Source 
Release-3.5: server/etcdmain: add configurable cipher list to gRPC proxy listener
This commit is contained in:
Benjamin Wang
2022-10-16 06:35:17 +08:00
committed by GitHub
parent 62169d12eb db55011d7c
commit ec6f0a74ba
4 changed files with 88 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
server/embed/config.go
View File

@@ -619,13 +619,9 @@ func updateCipherSuites(tls *transport.TLSInfo, ss []string) error {
return fmt.Errorf("TLSInfo.CipherSuites is already specified (given %v)", ss)
}
if len(ss) > 0 {
cs := make([]uint16, len(ss))
for i, s := range ss {
var ok bool
cs[i], ok = tlsutil.GetCipherSuite(s)
if !ok {
return fmt.Errorf("unexpected TLS cipher suite %q", s)
}
cs, err := tlsutil.GetCipherSuites(ss)
if err != nil {
return err
}
tls.CipherSuites = cs
}