diff options
author | Roland Shoemaker <bracewell@google.com> | 2024-01-18 12:51:13 -0800 |
---|---|---|
committer | Gopher Robot <gobot@golang.org> | 2024-03-05 16:43:45 +0000 |
commit | 337b8e9cbfa749d9d5c899e0dc358e2208d5e54f (patch) | |
tree | e6f272bb0ebeb8e8cc156f8f00079860f4e40195 | |
parent | 16830ab48abb0cbc702298cafaa69839d0c9f4f9 (diff) | |
download | go-337b8e9cbfa749d9d5c899e0dc358e2208d5e54f.tar.gz go-337b8e9cbfa749d9d5c899e0dc358e2208d5e54f.zip |
[release-branch.go1.22] crypto/x509: make sure pub key is non-nil before interface conversion
alreadyInChain assumes all keys fit a interface which contains the
Equal method (which they do), but this ignores that certificates may
have a nil key when PublicKeyAlgorithm is UnknownPublicKeyAlgorithm. In
this case alreadyInChain panics.
Check that the key is non-nil as part of considerCandidate (we are never
going to build a chain containing UnknownPublicKeyAlgorithm anyway).
For #65390
Fixes #65831
Fixes CVE-2024-24783
Change-Id: Ibdccc0a487e3368b6812be35daad2512220243f3
Reviewed-on: https://team-review.git.corp.google.com/c/golang/go-private/+/2137282
Reviewed-by: Damien Neil <dneil@google.com>
Run-TryBot: Roland Shoemaker <bracewell@google.com>
Reviewed-by: Tatiana Bradley <tatianabradley@google.com>
Reviewed-on: https://team-review.git.corp.google.com/c/golang/go-private/+/2174343
Reviewed-by: Carlos Amedee <amedee@google.com>
Reviewed-by: Roland Shoemaker <bracewell@google.com>
Reviewed-on: https://go-review.googlesource.com/c/go/+/569235
LUCI-TryBot-Result: Go LUCI <golang-scoped@luci-project-accounts.iam.gserviceaccount.com>
Auto-Submit: Michael Knyszek <mknyszek@google.com>
Reviewed-by: Carlos Amedee <carlos@golang.org>
-rw-r--r-- | src/crypto/x509/verify.go | 2 | ||||
-rw-r--r-- | src/crypto/x509/verify_test.go | 19 |
2 files changed, 20 insertions, 1 deletions
diff --git a/src/crypto/x509/verify.go b/src/crypto/x509/verify.go index 9d3c3246d3..6efbff28bf 100644 --- a/src/crypto/x509/verify.go +++ b/src/crypto/x509/verify.go @@ -899,7 +899,7 @@ func (c *Certificate) buildChains(currentChain []*Certificate, sigChecks *int, o ) considerCandidate := func(certType int, candidate potentialParent) { - if alreadyInChain(candidate.cert, currentChain) { + if candidate.cert.PublicKey == nil || alreadyInChain(candidate.cert, currentChain) { return } diff --git a/src/crypto/x509/verify_test.go b/src/crypto/x509/verify_test.go index 861d2b3890..8a7a5f6e2c 100644 --- a/src/crypto/x509/verify_test.go +++ b/src/crypto/x509/verify_test.go @@ -2792,3 +2792,22 @@ func TestVerifyEKURootAsLeaf(t *testing.T) { } } + +func TestVerifyNilPubKey(t *testing.T) { + c := &Certificate{ + RawIssuer: []byte{1, 2, 3}, + AuthorityKeyId: []byte{1, 2, 3}, + } + opts := &VerifyOptions{} + opts.Roots = NewCertPool() + r := &Certificate{ + RawSubject: []byte{1, 2, 3}, + SubjectKeyId: []byte{1, 2, 3}, + } + opts.Roots.AddCert(r) + + _, err := c.buildChains([]*Certificate{r}, nil, opts) + if _, ok := err.(UnknownAuthorityError); !ok { + t.Fatalf("buildChains returned unexpected error, got: %v, want %v", err, UnknownAuthorityError{}) + } +} |