From 8c9a88c7d434cce6dd2f03f4be76c2ebfeb79880 Mon Sep 17 00:00:00 2001 From: Gyu-Ho Lee Date: Sun, 18 Sep 2016 22:50:45 +0900 Subject: [PATCH] pkg/transport: update tls.Config copy method For Go 1.7 --- pkg/transport/listener.go | 36 +++++++++++++++++++----------------- 1 file changed, 19 insertions(+), 17 deletions(-) diff --git a/pkg/transport/listener.go b/pkg/transport/listener.go index 3ae1b21d4..4d38f3444 100644 --- a/pkg/transport/listener.go +++ b/pkg/transport/listener.go @@ -252,23 +252,25 @@ func (info TLSInfo) ClientConfig() (*tls.Config, error) { // Keep up-to-date with 'go/src/crypto/tls/common.go' func ShallowCopyTLSConfig(cfg *tls.Config) *tls.Config { ncfg := tls.Config{ - Time: cfg.Time, - Certificates: cfg.Certificates, - NameToCertificate: cfg.NameToCertificate, - GetCertificate: cfg.GetCertificate, - RootCAs: cfg.RootCAs, - NextProtos: cfg.NextProtos, - ServerName: cfg.ServerName, - ClientAuth: cfg.ClientAuth, - ClientCAs: cfg.ClientCAs, - InsecureSkipVerify: cfg.InsecureSkipVerify, - CipherSuites: cfg.CipherSuites, - PreferServerCipherSuites: cfg.PreferServerCipherSuites, - SessionTicketKey: cfg.SessionTicketKey, - ClientSessionCache: cfg.ClientSessionCache, - MinVersion: cfg.MinVersion, - MaxVersion: cfg.MaxVersion, - CurvePreferences: cfg.CurvePreferences, + Time: cfg.Time, + Certificates: cfg.Certificates, + NameToCertificate: cfg.NameToCertificate, + GetCertificate: cfg.GetCertificate, + RootCAs: cfg.RootCAs, + NextProtos: cfg.NextProtos, + ServerName: cfg.ServerName, + ClientAuth: cfg.ClientAuth, + ClientCAs: cfg.ClientCAs, + InsecureSkipVerify: cfg.InsecureSkipVerify, + CipherSuites: cfg.CipherSuites, + PreferServerCipherSuites: cfg.PreferServerCipherSuites, + SessionTicketKey: cfg.SessionTicketKey, + ClientSessionCache: cfg.ClientSessionCache, + MinVersion: cfg.MinVersion, + MaxVersion: cfg.MaxVersion, + DynamicRecordSizingDisabled: cfg.DynamicRecordSizingDisabled, + Renegotiation: cfg.Renegotiation, + CurvePreferences: cfg.CurvePreferences, } return &ncfg }