qbit/go
1
0
Fork 0
mirror of https://github.com/golang/go synced 2024-11-19 04:04:47 -07:00
Code Releases Activity

crypto/tls: better error messages for certificate issues.

Browse Source 
Fixes #1146.

R=rsc, agl1
CC=golang-dev
https://golang.org/cl/2380042
This commit is contained in:
Adam Langley 2010-10-11 10:39:56 -04:00
parent 1e66a21348
commit f6e2eab8e0
3 changed files with 21 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/pkg/crypto/tls/handshake_client.go
View File

@ -37,7 +37,8 @@ func (c *Conn) clientHandshake() os.Error {
hello.random[3] = byte(t) hello.random[3] = byte(t)
_, err := io.ReadFull(c.config.Rand, hello.random[4:]) _, err := io.ReadFull(c.config.Rand, hello.random[4:])
if err != nil { if err != nil {
return c.sendAlert(alertInternalError) c.sendAlert(alertInternalError)
return os.ErrorString("short read from Rand")
} }
finishedHash.Write(hello.marshal()) finishedHash.Write(hello.marshal())
@ -79,14 +80,16 @@ func (c *Conn) clientHandshake() os.Error {
for i, asn1Data := range certMsg.certificates { for i, asn1Data := range certMsg.certificates {
cert, err := x509.ParseCertificate(asn1Data) cert, err := x509.ParseCertificate(asn1Data)
if err != nil { if err != nil {
return c.sendAlert(alertBadCertificate) c.sendAlert(alertBadCertificate)
return os.ErrorString("failed to parse certificate from server: " + err.String())
} }
certs[i] = cert certs[i] = cert
} }
for i := 1; i < len(certs); i++ { for i := 1; i < len(certs); i++ {
if !certs[i].BasicConstraintsValid || !certs[i].IsCA { if !certs[i].BasicConstraintsValid || !certs[i].IsCA {
return c.sendAlert(alertBadCertificate) c.sendAlert(alertBadCertificate)
return os.ErrorString("intermediate certificate does not have CA bit set")
} }
// KeyUsage status flags are ignored. From Engineering // KeyUsage status flags are ignored. From Engineering
// Security, Peter Gutmann: // Security, Peter Gutmann:
@ -109,7 +112,8 @@ func (c *Conn) clientHandshake() os.Error {
// could only be used for Diffie-Hellman key agreement. // could only be used for Diffie-Hellman key agreement.
if err := certs[i-1].CheckSignatureFrom(certs[i]); err != nil { if err := certs[i-1].CheckSignatureFrom(certs[i]); err != nil {
return c.sendAlert(alertBadCertificate) c.sendAlert(alertBadCertificate)
return os.ErrorString("could not validate certificate signature: " + err.String())
} }
} }
@ -117,10 +121,12 @@ func (c *Conn) clientHandshake() os.Error {
if c.config.RootCAs != nil { if c.config.RootCAs != nil {
root := c.config.RootCAs.FindParent(certs[len(certs)-1]) root := c.config.RootCAs.FindParent(certs[len(certs)-1])
if root == nil { if root == nil {
return c.sendAlert(alertBadCertificate) c.sendAlert(alertBadCertificate)
return os.ErrorString("could not find root certificate for chain")
} }
if certs[len(certs)-1].CheckSignatureFrom(root) != nil { if err := certs[len(certs)-1].CheckSignatureFrom(root); err != nil {
return c.sendAlert(alertBadCertificate) c.sendAlert(alertBadCertificate)
return os.ErrorString("could not validate signature from expected root: " + err.String())
} }
} }

9
src/pkg/crypto/tls/handshake_server.go
View File

@ -145,7 +145,8 @@ func (c *Conn) serverHandshake() os.Error {
for i, asn1Data := range certMsg.certificates { for i, asn1Data := range certMsg.certificates {
cert, err := x509.ParseCertificate(asn1Data) cert, err := x509.ParseCertificate(asn1Data)
if err != nil { if err != nil {
return c.sendAlert(alertBadCertificate) c.sendAlert(alertBadCertificate)
return os.ErrorString("could not parse client's certificate: " + err.String())
} }
certs[i] = cert certs[i] = cert
} }
@ -153,7 +154,8 @@ func (c *Conn) serverHandshake() os.Error {
// TODO(agl): do better validation of certs: max path length, name restrictions etc. // TODO(agl): do better validation of certs: max path length, name restrictions etc.
for i := 1; i < len(certs); i++ { for i := 1; i < len(certs); i++ {
if err := certs[i-1].CheckSignatureFrom(certs[i]); err != nil { if err := certs[i-1].CheckSignatureFrom(certs[i]); err != nil {
return c.sendAlert(alertBadCertificate) c.sendAlert(alertBadCertificate)
return os.ErrorString("could not validate certificate signature: " + err.String())
} }
} }
@ -199,7 +201,8 @@ func (c *Conn) serverHandshake() os.Error {
copy(digest[16:36], finishedHash.serverSHA1.Sum()) copy(digest[16:36], finishedHash.serverSHA1.Sum())
err = rsa.VerifyPKCS1v15(pub, rsa.HashMD5SHA1, digest, certVerify.signature) err = rsa.VerifyPKCS1v15(pub, rsa.HashMD5SHA1, digest, certVerify.signature)
if err != nil { if err != nil {
return c.sendAlert(alertBadCertificate) c.sendAlert(alertBadCertificate)
return os.ErrorString("could not validate signature of connection nonces: " + err.String())
} }
finishedHash.Write(certVerify.marshal()) finishedHash.Write(certVerify.marshal())

3
src/pkg/crypto/tls/tls.go
View File

@ -76,7 +76,8 @@ func Dial(network, laddr, raddr string) (net.Conn, os.Error) {
return nil, err return nil, err
} }
// LoadX509KeyPair // 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 os.Error) { func LoadX509KeyPair(certFile string, keyFile string) (cert Certificate, err os.Error) {
certPEMBlock, err := ioutil.ReadFile(certFile) certPEMBlock, err := ioutil.ReadFile(certFile)
if err != nil { if err != nil {