kris/th5
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

crypto/tls: note in comments that setting GetCertificate is now sufficient.

Browse Source 
In Go 1.5, Config.Certificates is no longer required if
Config.GetCertificate has been set. This change updated four comments to
reflect that.

Change-Id: Id72cc22fc79e931b2d645a7c3960c3241042762c
Reviewed-on: https://go-review.googlesource.com/13800
Reviewed-by: Adam Langley <agl@golang.org>
This commit is contained in:
aubble 2015-08-20 14:26:56 -04:00 committed by Adam Langley
parent 6789988ece
commit 06234ee3fc
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
common.go
View File

@ -255,7 +255,8 @@ type Config struct {
// Certificates contains one or more certificate chains // Certificates contains one or more certificate chains
// to present to the other side of the connection. // to present to the other side of the connection.
// Server configurations must include at least one certificate. // Server configurations must include at least one certificate
// or else set GetCertificate.
Certificates []Certificate Certificates []Certificate
// NameToCertificate maps from a certificate name to an element of // NameToCertificate maps from a certificate name to an element of

12
tls.go
View File

@ -20,8 +20,8 @@ import (
// Server returns a new TLS server side connection // Server returns a new TLS server side connection
// using conn as the underlying transport. // using conn as the underlying transport.
// The configuration config must be non-nil and must have // The configuration config must be non-nil and must include
// at least one certificate. // at least one certificate or else set GetCertificate.
func Server(conn net.Conn, config *Config) *Conn { func Server(conn net.Conn, config *Config) *Conn {
return &Conn{conn: conn, config: config} return &Conn{conn: conn, config: config}
} }
@ -53,8 +53,8 @@ func (l *listener) Accept() (c net.Conn, err error) {
// NewListener creates a Listener which accepts connections from an inner // NewListener creates a Listener which accepts connections from an inner
// Listener and wraps each connection with Server. // Listener and wraps each connection with Server.
// The configuration config must be non-nil and must have // The configuration config must be non-nil and must include
// at least one certificate. // at least one certificate or else set GetCertificate.
func NewListener(inner net.Listener, config *Config) net.Listener { func NewListener(inner net.Listener, config *Config) net.Listener {
l := new(listener) l := new(listener)
l.Listener = inner l.Listener = inner
@ -64,8 +64,8 @@ func NewListener(inner net.Listener, config *Config) net.Listener {
// Listen creates a TLS listener accepting connections on the // Listen creates a TLS listener accepting connections on the
// given network address using net.Listen. // given network address using net.Listen.
// The configuration config must be non-nil and must have // The configuration config must be non-nil and must include
// at least one certificate. // at least one certificate or else set GetCertificate.
func Listen(network, laddr string, config *Config) (net.Listener, error) { func Listen(network, laddr string, config *Config) (net.Listener, error) {
if config == nil || (len(config.Certificates) == 0 && config.GetCertificate == nil) { if config == nil || (len(config.Certificates) == 0 && config.GetCertificate == nil) {
return nil, errors.New("tls: neither Certificates nor GetCertificate set in Config") return nil, errors.New("tls: neither Certificates nor GetCertificate set in Config")