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

We are re-sealing the .zip file anyway for another reason, might as well
take the opportunity to fix the "v1.0" mistake.

Note that the actual returned version change will happen when re-sealing
the .zip, as the latest mkzip.go will inject "v1.0.0" instead of "v1.0".

This reapplies CL 701518, reverted in CL 702255.

Change-Id: Ib5b3721bda35c32dd48293b3d1193c12661662dd
Reviewed-on: https://go-review.googlesource.com/c/go/+/702316
Reviewed-by: Roland Shoemaker <roland@golang.org>
Reviewed-by: Dmitri Shuralyov <dmitshur@google.com>
TryBot-Bypass: Filippo Valsorda <filippo@golang.org>
This commit is contained in:
Filippo Valsorda 2025-09-10 03:19:49 -07:00
parent fb5719cbda
commit 7f9ab7203f
4 changed files with 3 additions and 8 deletions

View file

@ -20,7 +20,7 @@ type MakeHash func() hash.Hash
// TestHash performs a set of tests on hash.Hash implementations, checking the // TestHash performs a set of tests on hash.Hash implementations, checking the
// documented requirements of Write, Sum, Reset, Size, and BlockSize. // documented requirements of Write, Sum, Reset, Size, and BlockSize.
func TestHash(t *testing.T, mh MakeHash) { func TestHash(t *testing.T, mh MakeHash) {
if boring.Enabled || fips140.Version() == "v1.0" { if boring.Enabled || fips140.Version() == "v1.0.0" {
testhash.TestHashWithoutClone(t, testhash.MakeHash(mh)) testhash.TestHashWithoutClone(t, testhash.MakeHash(mh))
return return
} }

View file

@ -67,7 +67,7 @@ func Name() string {
return "Go Cryptographic Module" return "Go Cryptographic Module"
} }
// Version returns the formal version (such as "v1.0") if building against a // Version returns the formal version (such as "v1.0.0") if building against a
// frozen module with GOFIPS140. Otherwise, it returns "latest". // frozen module with GOFIPS140. Otherwise, it returns "latest".
func Version() string { func Version() string {
// This return value is replaced by mkzip.go, it must not be changed or // This return value is replaced by mkzip.go, it must not be changed or

View file

@ -74,11 +74,6 @@ func TestVersion(t *testing.T) {
continue continue
} }
exp := setting.Value 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 { if v := fips140.Version(); v != exp {
t.Errorf("Version is %q, expected %q", v, exp) t.Errorf("Version is %q, expected %q", v, exp)
} }

View file

@ -1246,7 +1246,7 @@ func TestModifiedPrivateKey(t *testing.T) {
}) })
t.Run("D+2", func(t *testing.T) { t.Run("D+2", func(t *testing.T) {
if fips140.Version() == "v1.0" { if fips140.Version() == "v1.0.0" {
t.Skip("This was fixed after v1.0.0") t.Skip("This was fixed after v1.0.0")
} }
testModifiedPrivateKey(t, func(k *PrivateKey) { testModifiedPrivateKey(t, func(k *PrivateKey) {