mirror of
https://github.com/golang/go
synced 2024-11-26 04:17:59 -07:00
cmd/dist: adjust FIPS 140 tests
An earlier CL moved the actual test from crypto/internal/fips/check to crypto/internal/fipstest (now crypto/internal/fips140test), so this cmd/dist check has been doing nothing for a little while. Fix it to do what it intends. Also run the actual crypto package tests in FIPS mode in long mode. Change-Id: Iea8113376b95ec068a459cb8f3d0e77d3e2340f6 Reviewed-on: https://go-review.googlesource.com/c/go/+/630116 Reviewed-by: Filippo Valsorda <filippo@golang.org> LUCI-TryBot-Result: Go LUCI <golang-scoped@luci-project-accounts.iam.gserviceaccount.com> Reviewed-by: Dmitri Shuralyov <dmitshur@google.com>
This commit is contained in:
parent
02df9bbdbd
commit
ce33585a1a
63
src/cmd/dist/test.go
vendored
63
src/cmd/dist/test.go
vendored
@ -323,6 +323,7 @@ type goTest struct {
|
||||
bench bool // Run benchmarks (briefly), not tests.
|
||||
runTests string // Regexp of tests to run
|
||||
cpu string // If non-empty, -cpu flag
|
||||
skip string // If non-empty, -skip flag
|
||||
|
||||
gcflags string // If non-empty, build with -gcflags=all=X
|
||||
ldflags string // If non-empty, build with -ldflags=X
|
||||
@ -464,6 +465,9 @@ func (opts *goTest) buildArgs(t *tester) (build, run, pkgs, testFlags []string,
|
||||
if opts.cpu != "" {
|
||||
run = append(run, "-cpu="+opts.cpu)
|
||||
}
|
||||
if opts.skip != "" {
|
||||
run = append(run, "-skip="+opts.skip)
|
||||
}
|
||||
if t.json {
|
||||
run = append(run, "-json")
|
||||
}
|
||||
@ -698,22 +702,40 @@ func (t *tester) registerTests() {
|
||||
}
|
||||
|
||||
// Check that all crypto packages compile with the purego build tag.
|
||||
t.registerTest("crypto with tag purego", &goTest{
|
||||
t.registerTest("crypto with tag purego (build and vet only)", &goTest{
|
||||
variant: "purego",
|
||||
tags: []string{"purego"},
|
||||
pkg: "crypto/...",
|
||||
runTests: "^$", // only ensure they compile
|
||||
})
|
||||
|
||||
// Check that all crypto packages compile with fips.
|
||||
for _, version := range fipsVersions() {
|
||||
t.registerTest("crypto with GOFIPS140", &goTest{
|
||||
// Check that all crypto packages compile (and test correctly, in longmode) with fips.
|
||||
if fipsSupported() {
|
||||
// Test standard crypto packages with fips140=on.
|
||||
t.registerTest("GODEBUG=fips140=on go test crypto/...", &goTest{
|
||||
variant: "gofips140",
|
||||
env: []string{"GODEBUG=fips140=on"},
|
||||
skip: "TestHandshake|TestServerResumption|TestClientAuth|TestRenegotiate", // TODO(valsorda): remove once crypto/tls passes
|
||||
pkg: "crypto/...",
|
||||
})
|
||||
|
||||
// Test that earlier FIPS snapshots build.
|
||||
// In long mode, test that they work too.
|
||||
for _, version := range fipsVersions(t.short) {
|
||||
suffix := " # (build and vet only)"
|
||||
run := "^$" // only ensure they compile
|
||||
if !t.short {
|
||||
suffix = ""
|
||||
run = ""
|
||||
}
|
||||
t.registerTest("GOFIPS140="+version+" go test crypto/..."+suffix, &goTest{
|
||||
variant: "gofips140-" + version,
|
||||
pkg: "crypto/...",
|
||||
runTests: "^$", // only ensure they compile
|
||||
runTests: run,
|
||||
env: []string{"GOFIPS140=" + version, "GOMODCACHE=" + filepath.Join(workdir, "fips-"+version)},
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
// Test ios/amd64 for the iOS simulator.
|
||||
if goos == "darwin" && goarch == "amd64" && t.cgoEnabled {
|
||||
@ -834,7 +856,8 @@ func (t *tester) registerTests() {
|
||||
buildmode: "pie",
|
||||
ldflags: "-linkmode=internal",
|
||||
env: []string{"CGO_ENABLED=0"},
|
||||
pkg: "crypto/internal/fips140/check",
|
||||
pkg: "crypto/internal/fips140test",
|
||||
runTests: "TestFIPSCheck",
|
||||
})
|
||||
// Also test a cgo package.
|
||||
if t.cgoEnabled && t.internalLink() && !disablePIE {
|
||||
@ -857,7 +880,8 @@ func (t *tester) registerTests() {
|
||||
buildmode: "exe",
|
||||
ldflags: "-linkmode=external",
|
||||
env: []string{"CGO_ENABLED=1"},
|
||||
pkg: "crypto/internal/fips140/check",
|
||||
pkg: "crypto/internal/fips140test",
|
||||
runTests: "TestFIPSCheck",
|
||||
})
|
||||
if t.externalLinkPIE() && !disablePIE {
|
||||
t.registerTest("external linking, -buildmode=pie",
|
||||
@ -867,7 +891,8 @@ func (t *tester) registerTests() {
|
||||
buildmode: "pie",
|
||||
ldflags: "-linkmode=external",
|
||||
env: []string{"CGO_ENABLED=1"},
|
||||
pkg: "crypto/internal/fips140/check",
|
||||
pkg: "crypto/internal/fips140test",
|
||||
runTests: "TestFIPSCheck",
|
||||
})
|
||||
}
|
||||
}
|
||||
@ -1766,8 +1791,28 @@ func isEnvSet(evar string) bool {
|
||||
return false
|
||||
}
|
||||
|
||||
func fipsSupported() bool {
|
||||
// Use GOFIPS140 or GOEXPERIMENT=boringcrypto, but not both.
|
||||
if strings.Contains(goexperiment, "boringcrypto") {
|
||||
return false
|
||||
}
|
||||
|
||||
// If this goos/goarch does not support FIPS at all, return no versions.
|
||||
// The logic here matches crypto/internal/fips140/check.Supported for now.
|
||||
// In the future, if some snapshots add support for these, we will have
|
||||
// to make a decision on a per-version basis.
|
||||
switch {
|
||||
case goarch == "wasm",
|
||||
goos == "windows" && goarch == "386",
|
||||
goos == "windows" && goarch == "arm",
|
||||
goos == "aix":
|
||||
return false
|
||||
}
|
||||
return true
|
||||
}
|
||||
|
||||
// fipsVersions returns the list of versions available in lib/fips140.
|
||||
func fipsVersions() []string {
|
||||
func fipsVersions(short bool) []string {
|
||||
var versions []string
|
||||
zips, err := filepath.Glob(filepath.Join(goroot, "lib/fips140/*.zip"))
|
||||
if err != nil {
|
||||
|
Loading…
Reference in New Issue
Block a user