crypto/x509: add Unwrap to SystemRootsError

This change modifies Go to add the Unwrap method to SystemRootsError

Updates #30322

Change-Id: Ibe63d1d0bc832fc0607f09053908d55275a6f350
GitHub-Last-Rev: 9a95bc66019d25f02a0a5f92a87e9405a52802e4
GitHub-Pull-Request: golang/go#41981
Reviewed-on: https://go-review.googlesource.com/c/go/+/262343
Reviewed-by: Damien Neil <dneil@google.com>
Reviewed-by: Filippo Valsorda <filippo@golang.org>
Trust: Damien Neil <dneil@google.com>
Run-TryBot: Filippo Valsorda <filippo@golang.org>
TryBot-Result: Go Bot <gobot@golang.org>

diff --git a/src/crypto/x509/verify.go b/src/crypto/x509/verify.go
index cb8d8f872dd4d79b520491b4e01d7519815920e7..5fdd4cb9fe1bbbecf86d43dd42076060ed20e818 100644 (file)
--- a/src/crypto/x509/verify.go
+++ b/src/crypto/x509/verify.go
@@ -187,6 +187,8 @@ func (se SystemRootsError) Error() string {
        return msg
 }
 
+func (se SystemRootsError) Unwrap() error { return se.Err }
+
 // errNotParsed is returned when a certificate without ASN.1 contents is
 // verified. Platform-specific verification needs the ASN.1 contents.
 var errNotParsed = errors.New("x509: missing ASN.1 contents; use ParseCertificate")

diff --git a/src/crypto/x509/verify_test.go b/src/crypto/x509/verify_test.go
index c7a715bbcbb02bc2d72a3908434a97749bfb717c..9cc17c7b3d89b6832fbdfe8d50f3ce54e055d84a 100644 (file)
--- a/src/crypto/x509/verify_test.go
+++ b/src/crypto/x509/verify_test.go
@@ -2005,3 +2005,11 @@ func TestSystemRootsError(t *testing.T) {
                t.Errorf("error was not SystemRootsError: %v", err)
        }
 }
+
+func TestSystemRootsErrorUnwrap(t *testing.T) {
+       var err1 = errors.New("err1")
+       err := SystemRootsError{Err: err1}
+       if !errors.Is(err, err1) {
+               t.Error("errors.Is failed, wanted success")
+       }
+}