Skip to content

Commit 968a510

Browse files
FiloSottilegopherbot
authored andcommitted
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. Change-Id: I6a6a69646b3188984c865031ff9393ccaaaa9479 Reviewed-on: https://go-review.googlesource.com/c/go/+/701518 Reviewed-by: Daniel McCarney <[email protected]> Auto-Submit: Filippo Valsorda <[email protected]> Reviewed-by: Mark Freeman <[email protected]> LUCI-TryBot-Result: Go LUCI <[email protected]> Reviewed-by: Michael Pratt <[email protected]>
1 parent 645ee44 commit 968a510

File tree

3 files changed

+2
-7
lines changed

3 files changed

+2
-7
lines changed

src/crypto/internal/cryptotest/hash.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ type MakeHash func() hash.Hash
2020
// TestHash performs a set of tests on hash.Hash implementations, checking the
2121
// documented requirements of Write, Sum, Reset, Size, and BlockSize.
2222
func TestHash(t *testing.T, mh MakeHash) {
23-
if boring.Enabled || fips140.Version() == "v1.0" {
23+
if boring.Enabled || fips140.Version() == "v1.0.0" {
2424
testhash.TestHashWithoutClone(t, testhash.MakeHash(mh))
2525
return
2626
}

src/crypto/internal/fips140/fips140.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ func Name() string {
6262
return "Go Cryptographic Module"
6363
}
6464

65-
// Version returns the formal version (such as "v1.0") if building against a
65+
// Version returns the formal version (such as "v1.0.0") if building against a
6666
// frozen module with GOFIPS140. Otherwise, it returns "latest".
6767
func Version() string {
6868
// This return value is replaced by mkzip.go, it must not be changed or

src/crypto/internal/fips140test/fips_test.go

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -74,11 +74,6 @@ func TestVersion(t *testing.T) {
7474
continue
7575
}
7676
exp := setting.Value
77-
if exp == "v1.0.0" {
78-
// Unfortunately we enshrined the version of the first module as
79-
// v1.0 before deciding to go for full versions.
80-
exp = "v1.0"
81-
}
8277
if v := fips140.Version(); v != exp {
8378
t.Errorf("Version is %q, expected %q", v, exp)
8479
}

0 commit comments

Comments
 (0)