mirror of
https://github.com/golang/go.git
synced 2025-10-19 11:03:18 +00:00
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 <daniel@binaryparadox.net> Auto-Submit: Filippo Valsorda <filippo@golang.org> Reviewed-by: Mark Freeman <markfreeman@google.com> LUCI-TryBot-Result: Go LUCI <golang-scoped@luci-project-accounts.iam.gserviceaccount.com> Reviewed-by: Michael Pratt <mpratt@google.com>
This commit is contained in:
parent
645ee44492
commit
968a5107a9
3 changed files with 2 additions and 7 deletions
|
@ -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" {
|
||||
if boring.Enabled || fips140.Version() == "v1.0.0" {
|
||||
testhash.TestHashWithoutClone(t, testhash.MakeHash(mh))
|
||||
return
|
||||
}
|
||||
|
|
|
@ -62,7 +62,7 @@ func Name() string {
|
|||
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".
|
||||
func Version() string {
|
||||
// This return value is replaced by mkzip.go, it must not be changed or
|
||||
|
|
|
@ -74,11 +74,6 @@ 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)
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue