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 #6467 from coreos/revert-6465-tls-copy

Browse Source 
Revert "pkg/transport: update tls.Config copy method"
This commit is contained in:
Gyu-Ho Lee 2016-09-19 16:02:41 +09:00 committed by GitHub
commit 2dc06787ae
1 changed files with 17 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
pkg/transport/listener.go
View File

@ -252,25 +252,23 @@ func (info TLSInfo) ClientConfig() (*tls.Config, error) {
// Keep up-to-date with 'go/src/crypto/tls/common.go' // Keep up-to-date with 'go/src/crypto/tls/common.go'
func ShallowCopyTLSConfig(cfg *tls.Config) *tls.Config { func ShallowCopyTLSConfig(cfg *tls.Config) *tls.Config {
ncfg := tls.Config{ ncfg := tls.Config{
Time: cfg.Time, Time: cfg.Time,
Certificates: cfg.Certificates, Certificates: cfg.Certificates,
NameToCertificate: cfg.NameToCertificate, NameToCertificate: cfg.NameToCertificate,
GetCertificate: cfg.GetCertificate, GetCertificate: cfg.GetCertificate,
RootCAs: cfg.RootCAs, RootCAs: cfg.RootCAs,
NextProtos: cfg.NextProtos, NextProtos: cfg.NextProtos,
ServerName: cfg.ServerName, ServerName: cfg.ServerName,
ClientAuth: cfg.ClientAuth, ClientAuth: cfg.ClientAuth,
ClientCAs: cfg.ClientCAs, ClientCAs: cfg.ClientCAs,
InsecureSkipVerify: cfg.InsecureSkipVerify, InsecureSkipVerify: cfg.InsecureSkipVerify,
CipherSuites: cfg.CipherSuites, CipherSuites: cfg.CipherSuites,
PreferServerCipherSuites: cfg.PreferServerCipherSuites, PreferServerCipherSuites: cfg.PreferServerCipherSuites,
SessionTicketKey: cfg.SessionTicketKey, SessionTicketKey: cfg.SessionTicketKey,
ClientSessionCache: cfg.ClientSessionCache, ClientSessionCache: cfg.ClientSessionCache,
MinVersion: cfg.MinVersion, MinVersion: cfg.MinVersion,
MaxVersion: cfg.MaxVersion, MaxVersion: cfg.MaxVersion,
DynamicRecordSizingDisabled: cfg.DynamicRecordSizingDisabled, CurvePreferences: cfg.CurvePreferences,
Renegotiation: cfg.Renegotiation,
CurvePreferences: cfg.CurvePreferences,
} }
return &ncfg return &ncfg
} }