From 249af5c85eb0ba05592ea3ffac71c4a2f824a216 Mon Sep 17 00:00:00 2001 From: Mikkel Krautz Date: Thu, 24 Jan 2013 01:20:17 +0800 Subject: [PATCH] crypto/x509: skip SystemRootsError test on Windows On Windows, crypto/x509 passes through to Windows's CryptoAPI to verify certificate chains. This method can't produce a SystemRootsError, so make sure we always skip the test on Windows. This is needed because testVerify is called in both TestGoVerify and TestSystemVerify on Windows - one is for testing the Go verifier, the other one is for testing the CryptoAPI verifier. The orignal CL tried to sidestep this issue by setting systemSkip to true, but that only affected TestSystemVerify. R=golang-dev, agl, snaury, minux.ma CC=golang-dev https://golang.org/cl/7185043 --- src/pkg/crypto/x509/verify_test.go | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/pkg/crypto/x509/verify_test.go b/src/pkg/crypto/x509/verify_test.go index 1ed95fe628..0381752e8d 100644 --- a/src/pkg/crypto/x509/verify_test.go +++ b/src/pkg/crypto/x509/verify_test.go @@ -35,7 +35,6 @@ var verifyTests = []verifyTest{ currentTime: 1302726541, dnsName: "www.google.com", testSystemRootsError: true, - systemSkip: true, // Without any roots specified we should get a system roots // error. @@ -214,6 +213,9 @@ func testVerify(t *testing.T, useSystemRoots bool) { if useSystemRoots && test.systemSkip { continue } + if runtime.GOOS == "windows" && test.testSystemRootsError { + continue + } opts := VerifyOptions{ Intermediates: NewCertPool(), -- 2.48.1