diff --git a/src/crypto/internal/cryptotest/hash.go b/src/crypto/internal/cryptotest/hash.go index 37fd96a2d9d..f00e9c80d3c 100644 --- a/src/crypto/internal/cryptotest/hash.go +++ b/src/crypto/internal/cryptotest/hash.go @@ -20,7 +20,7 @@ type MakeHash func() hash.Hash // TestHash performs a set of tests on hash.Hash implementations, checking the // documented requirements of Write, Sum, Reset, Size, and BlockSize. func TestHash(t *testing.T, mh MakeHash) { - if boring.Enabled || fips140.Version() == "v1.0.0" { + if boring.Enabled || fips140.Version() == "v1.0" { testhash.TestHashWithoutClone(t, testhash.MakeHash(mh)) return } diff --git a/src/crypto/internal/fips140/fips140.go b/src/crypto/internal/fips140/fips140.go index 79dda605fec..fd265718e02 100644 --- a/src/crypto/internal/fips140/fips140.go +++ b/src/crypto/internal/fips140/fips140.go @@ -62,7 +62,7 @@ func Name() string { return "Go Cryptographic Module" } -// Version returns the formal version (such as "v1.0.0") if building against a +// Version returns the formal version (such as "v1.0") if building against a // frozen module with GOFIPS140. Otherwise, it returns "latest". func Version() string { // This return value is replaced by mkzip.go, it must not be changed or diff --git a/src/crypto/internal/fips140test/fips_test.go b/src/crypto/internal/fips140test/fips_test.go index 6220e536f4a..08d60933ef3 100644 --- a/src/crypto/internal/fips140test/fips_test.go +++ b/src/crypto/internal/fips140test/fips_test.go @@ -74,6 +74,11 @@ func TestVersion(t *testing.T) { continue } exp := setting.Value + if exp == "v1.0.0" { + // Unfortunately we enshrined the version of the first module as + // v1.0 before deciding to go for full versions. + exp = "v1.0" + } if v := fips140.Version(); v != exp { t.Errorf("Version is %q, expected %q", v, exp) }