82f6e24f53
OpenSSL 1.0.0 has switched to generating PKCS#8 format private keys by default. This change allows http.ListenAndServeTLS to work with either types of keys. See http://groups.google.com/group/golang-nuts/browse_thread/thread/84715b5f0c9e3c30/63a8a27b53e102a6 R=bradfitz CC=golang-dev https://golang.org/cl/5416059
193 lines
5.3 KiB
Go
193 lines
5.3 KiB
Go
// Copyright 2009 The Go Authors. All rights reserved.
|
|
// Use of this source code is governed by a BSD-style
|
|
// license that can be found in the LICENSE file.
|
|
|
|
// Package tls partially implements the TLS 1.1 protocol, as specified in RFC
|
|
// 4346.
|
|
package tls
|
|
|
|
import (
|
|
"crypto/rsa"
|
|
"crypto/x509"
|
|
"encoding/pem"
|
|
"errors"
|
|
"io/ioutil"
|
|
"net"
|
|
"strings"
|
|
)
|
|
|
|
// Server returns a new TLS server side connection
|
|
// using conn as the underlying transport.
|
|
// The configuration config must be non-nil and must have
|
|
// at least one certificate.
|
|
func Server(conn net.Conn, config *Config) *Conn {
|
|
return &Conn{conn: conn, config: config}
|
|
}
|
|
|
|
// Client returns a new TLS client side connection
|
|
// using conn as the underlying transport.
|
|
// Client interprets a nil configuration as equivalent to
|
|
// the zero configuration; see the documentation of Config
|
|
// for the defaults.
|
|
func Client(conn net.Conn, config *Config) *Conn {
|
|
return &Conn{conn: conn, config: config, isClient: true}
|
|
}
|
|
|
|
// A Listener implements a network listener (net.Listener) for TLS connections.
|
|
type Listener struct {
|
|
listener net.Listener
|
|
config *Config
|
|
}
|
|
|
|
// Accept waits for and returns the next incoming TLS connection.
|
|
// The returned connection c is a *tls.Conn.
|
|
func (l *Listener) Accept() (c net.Conn, err error) {
|
|
c, err = l.listener.Accept()
|
|
if err != nil {
|
|
return
|
|
}
|
|
c = Server(c, l.config)
|
|
return
|
|
}
|
|
|
|
// Close closes the listener.
|
|
func (l *Listener) Close() error { return l.listener.Close() }
|
|
|
|
// Addr returns the listener's network address.
|
|
func (l *Listener) Addr() net.Addr { return l.listener.Addr() }
|
|
|
|
// NewListener creates a Listener which accepts connections from an inner
|
|
// Listener and wraps each connection with Server.
|
|
// The configuration config must be non-nil and must have
|
|
// at least one certificate.
|
|
func NewListener(listener net.Listener, config *Config) (l *Listener) {
|
|
l = new(Listener)
|
|
l.listener = listener
|
|
l.config = config
|
|
return
|
|
}
|
|
|
|
// Listen creates a TLS listener accepting connections on the
|
|
// given network address using net.Listen.
|
|
// The configuration config must be non-nil and must have
|
|
// at least one certificate.
|
|
func Listen(network, laddr string, config *Config) (*Listener, error) {
|
|
if config == nil || len(config.Certificates) == 0 {
|
|
return nil, errors.New("tls.Listen: no certificates in configuration")
|
|
}
|
|
l, err := net.Listen(network, laddr)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
return NewListener(l, config), nil
|
|
}
|
|
|
|
// Dial connects to the given network address using net.Dial
|
|
// and then initiates a TLS handshake, returning the resulting
|
|
// TLS connection.
|
|
// Dial interprets a nil configuration as equivalent to
|
|
// the zero configuration; see the documentation of Config
|
|
// for the defaults.
|
|
func Dial(network, addr string, config *Config) (*Conn, error) {
|
|
raddr := addr
|
|
c, err := net.Dial(network, raddr)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
colonPos := strings.LastIndex(raddr, ":")
|
|
if colonPos == -1 {
|
|
colonPos = len(raddr)
|
|
}
|
|
hostname := raddr[:colonPos]
|
|
|
|
if config == nil {
|
|
config = defaultConfig()
|
|
}
|
|
if config.ServerName != "" {
|
|
// Make a copy to avoid polluting argument or default.
|
|
c := *config
|
|
c.ServerName = hostname
|
|
config = &c
|
|
}
|
|
conn := Client(c, config)
|
|
if err = conn.Handshake(); err != nil {
|
|
c.Close()
|
|
return nil, err
|
|
}
|
|
return conn, nil
|
|
}
|
|
|
|
// LoadX509KeyPair reads and parses a public/private key pair from a pair of
|
|
// files. The files must contain PEM encoded data.
|
|
func LoadX509KeyPair(certFile string, keyFile string) (cert Certificate, err error) {
|
|
certPEMBlock, err := ioutil.ReadFile(certFile)
|
|
if err != nil {
|
|
return
|
|
}
|
|
keyPEMBlock, err := ioutil.ReadFile(keyFile)
|
|
if err != nil {
|
|
return
|
|
}
|
|
return X509KeyPair(certPEMBlock, keyPEMBlock)
|
|
}
|
|
|
|
// X509KeyPair parses a public/private key pair from a pair of
|
|
// PEM encoded data.
|
|
func X509KeyPair(certPEMBlock, keyPEMBlock []byte) (cert Certificate, err error) {
|
|
var certDERBlock *pem.Block
|
|
for {
|
|
certDERBlock, certPEMBlock = pem.Decode(certPEMBlock)
|
|
if certDERBlock == nil {
|
|
break
|
|
}
|
|
if certDERBlock.Type == "CERTIFICATE" {
|
|
cert.Certificate = append(cert.Certificate, certDERBlock.Bytes)
|
|
}
|
|
}
|
|
|
|
if len(cert.Certificate) == 0 {
|
|
err = errors.New("crypto/tls: failed to parse certificate PEM data")
|
|
return
|
|
}
|
|
|
|
keyDERBlock, _ := pem.Decode(keyPEMBlock)
|
|
if keyDERBlock == nil {
|
|
err = errors.New("crypto/tls: failed to parse key PEM data")
|
|
return
|
|
}
|
|
|
|
// OpenSSL 0.9.8 generates PKCS#1 private keys by default, while
|
|
// OpenSSL 1.0.0 generates PKCS#8 keys. We try both.
|
|
var key *rsa.PrivateKey
|
|
if key, err = x509.ParsePKCS1PrivateKey(keyDERBlock.Bytes); err != nil {
|
|
var privKey interface{}
|
|
if privKey, err = x509.ParsePKCS8PrivateKey(keyDERBlock.Bytes); err != nil {
|
|
err = errors.New("crypto/tls: failed to parse key: " + err.Error())
|
|
return
|
|
}
|
|
|
|
var ok bool
|
|
if key, ok = privKey.(*rsa.PrivateKey); !ok {
|
|
err = errors.New("crypto/tls: found non-RSA private key in PKCS#8 wrapping")
|
|
return
|
|
}
|
|
}
|
|
|
|
cert.PrivateKey = key
|
|
|
|
// We don't need to parse the public key for TLS, but we so do anyway
|
|
// to check that it looks sane and matches the private key.
|
|
x509Cert, err := x509.ParseCertificate(cert.Certificate[0])
|
|
if err != nil {
|
|
return
|
|
}
|
|
|
|
if x509Cert.PublicKeyAlgorithm != x509.RSA || x509Cert.PublicKey.(*rsa.PublicKey).N.Cmp(key.PublicKey.N) != 0 {
|
|
err = errors.New("crypto/tls: private key does not match public key")
|
|
return
|
|
}
|
|
|
|
return
|
|
}
|