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

crypto/tls: document certificate chains in LoadX509KeyPair

Browse Source 
Fixes #15348

Change-Id: I9e0e1e3a26fa4cd697d2c613e6b4952188b7c7e1
Reviewed-on: https://go-review.googlesource.com/23150
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>
This commit is contained in:
Scott Bell 2016-05-16 12:51:52 -07:00 committed by Brad Fitzpatrick
parent 07b6287f24
commit 6885da92a7
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
tls.go
View File

@ -170,10 +170,11 @@ func Dial(network, addr string, config *Config) (*Conn, error) {
return DialWithDialer(new(net.Dialer), network, addr, config) return DialWithDialer(new(net.Dialer), network, addr, config)
} }
// LoadX509KeyPair reads and parses a public/private key pair from a pair of // LoadX509KeyPair reads and parses a public/private key pair from a pair
// files. The files must contain PEM encoded data. On successful return, // of files. The files must contain PEM encoded data. The certificate file
// Certificate.Leaf will be nil because the parsed form of the certificate is // may contain intermediate certificates following the leaf certificate to
// not retained. // form a certificate chain. On successful return, Certificate.Leaf will
// be nil because the parsed form of the certificate is not retained.
func LoadX509KeyPair(certFile, keyFile string) (Certificate, error) { func LoadX509KeyPair(certFile, keyFile string) (Certificate, error) {
certPEMBlock, err := ioutil.ReadFile(certFile) certPEMBlock, err := ioutil.ReadFile(certFile)
if err != nil { if err != nil {