Revert "crypto/internal/fips140: update frozen module version to "v1.0.0""

This reverts CL 701518. This should land just before CL 701520 to avoid
breaking the builders for long.

Fixes #75343

Change-Id: If1ae1fe933fe443ca9776888967d80875b02f41a
Reviewed-on: https://go-review.googlesource.com/c/go/+/702255
Reviewed-by: Keith Randall <khr@google.com>
Reviewed-by: Keith Randall <khr@golang.org>
Reviewed-by: Dmitri Shuralyov <dmitshur@google.com>
LUCI-TryBot-Result: Go LUCI <golang-scoped@luci-project-accounts.iam.gserviceaccount.com>

diff --git a/src/crypto/internal/cryptotest/hash.go b/src/crypto/internal/cryptotest/hash.go
index 37fd96a2d9d0b9ef879f7a9eab22eeb2b25f90d0..f00e9c80d3c86af03757960e37749d6d458dbbd8 100644 (file)
--- 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 79dda605fecc70799202426a8aad51011f2e259b..fd265718e026c5436176e10ef2d67d4d21ea8f51 100644 (file)
--- 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 6220e536f4aa6eb6c327ecbd7d7b83a62de87674..08d60933ef38b8dad6da6f5df06cf326e8ee24f9 100644 (file)
--- 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)
                }