Commit 249af5c8 authored by Mikkel Krautz's avatar Mikkel Krautz Committed by Shenghou Ma

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
parent 34b533cd
...@@ -35,7 +35,6 @@ var verifyTests = []verifyTest{ ...@@ -35,7 +35,6 @@ var verifyTests = []verifyTest{
currentTime: 1302726541, currentTime: 1302726541,
dnsName: "www.google.com", dnsName: "www.google.com",
testSystemRootsError: true, testSystemRootsError: true,
systemSkip: true,
// Without any roots specified we should get a system roots // Without any roots specified we should get a system roots
// error. // error.
...@@ -214,6 +213,9 @@ func testVerify(t *testing.T, useSystemRoots bool) { ...@@ -214,6 +213,9 @@ func testVerify(t *testing.T, useSystemRoots bool) {
if useSystemRoots && test.systemSkip { if useSystemRoots && test.systemSkip {
continue continue
} }
if runtime.GOOS == "windows" && test.testSystemRootsError {
continue
}
opts := VerifyOptions{ opts := VerifyOptions{
Intermediates: NewCertPool(), Intermediates: NewCertPool(),
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment