diff options
| author | Brad Fitzpatrick <bradfitz@golang.org> | 2011-12-21 10:49:35 -0800 |
|---|---|---|
| committer | Brad Fitzpatrick <bradfitz@golang.org> | 2011-12-21 10:49:35 -0800 |
| commit | 71f0fb77602701bf3e3f6efd3aa1be5d42a64458 (patch) | |
| tree | 270edc6cb5911f2ff6212bb93f06a6baf53e4179 /src/pkg | |
| parent | 97853b46a08e984048e65f1d9c359bb48b8f22e4 (diff) | |
| download | go-71f0fb77602701bf3e3f6efd3aa1be5d42a64458.tar.xz | |
crypto/x509: don't crash with nil receiver in accessor method
Fixes #2600
R=golang-dev, agl, rsc
CC=golang-dev
https://golang.org/cl/5500064
Diffstat (limited to 'src/pkg')
| -rw-r--r-- | src/pkg/crypto/x509/cert_pool.go | 3 | ||||
| -rw-r--r-- | src/pkg/crypto/x509/verify_test.go | 12 |
2 files changed, 15 insertions, 0 deletions
diff --git a/src/pkg/crypto/x509/cert_pool.go b/src/pkg/crypto/x509/cert_pool.go index adc7f9bc6d..5a0a87678e 100644 --- a/src/pkg/crypto/x509/cert_pool.go +++ b/src/pkg/crypto/x509/cert_pool.go @@ -28,6 +28,9 @@ func NewCertPool() *CertPool { // given certificate. If no such certificate can be found or the signature // doesn't match, it returns nil. func (s *CertPool) findVerifiedParents(cert *Certificate) (parents []int) { + if s == nil { + return + } var candidates []int if len(cert.AuthorityKeyId) > 0 { diff --git a/src/pkg/crypto/x509/verify_test.go b/src/pkg/crypto/x509/verify_test.go index df5443023f..2016858307 100644 --- a/src/pkg/crypto/x509/verify_test.go +++ b/src/pkg/crypto/x509/verify_test.go @@ -19,6 +19,7 @@ type verifyTest struct { roots []string currentTime int64 dnsName string + nilRoots bool errorCallback func(*testing.T, int, error) bool expectedChains [][]string @@ -48,6 +49,14 @@ var verifyTests = []verifyTest{ { leaf: googleLeaf, intermediates: []string{thawteIntermediate}, + nilRoots: true, // verifies that we don't crash + currentTime: 1302726541, + dnsName: "www.google.com", + errorCallback: expectAuthorityUnknown, + }, + { + leaf: googleLeaf, + intermediates: []string{thawteIntermediate}, roots: []string{verisignRoot}, currentTime: 1, dnsName: "www.example.com", @@ -136,6 +145,9 @@ func TestVerify(t *testing.T) { DNSName: test.dnsName, CurrentTime: time.Unix(test.currentTime, 0), } + if test.nilRoots { + opts.Roots = nil + } for j, root := range test.roots { ok := opts.Roots.AppendCertsFromPEM([]byte(root)) |