Skip to content

Commit 69ccf44

Browse files
authored
go1.25.3 (#330)
1 parent 65b5038 commit 69ccf44

File tree

2 files changed

+19
-16
lines changed

2 files changed

+19
-16
lines changed

config/versions.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
22
"github.com/golang-fips/go": "main",
33
"github.com/golang-fips/openssl": "61a53ab338d5f1657c6fe5d856d24528bfdd731d",
4-
"github.com/golang/go": "go1.25.1"
4+
"github.com/golang/go": "go1.25.3"
55
}

patches/000-fips.patch

Lines changed: 18 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -547,7 +547,7 @@ index 275c60b4de..58f0034b18 100644
547547
"math/big"
548548
)
549549
diff --git a/src/crypto/ecdsa/ecdsa.go b/src/crypto/ecdsa/ecdsa.go
550-
index 9affc1ff78..e7732476e0 100644
550+
index 340edbbaba..59fbb95fe9 100644
551551
--- a/src/crypto/ecdsa/ecdsa.go
552552
+++ b/src/crypto/ecdsa/ecdsa.go
553553
@@ -20,8 +20,8 @@ import (
@@ -816,7 +816,7 @@ index 554c8c9b78..cdf97d8f81 100644
816816
if hm != nil {
817817
return hm
818818
diff --git a/src/crypto/hmac/hmac_test.go b/src/crypto/hmac/hmac_test.go
819-
index 9b7eee7bf7..bb9170f13b 100644
819+
index 4046a9555a..50f829a16b 100644
820820
--- a/src/crypto/hmac/hmac_test.go
821821
+++ b/src/crypto/hmac/hmac_test.go
822822
@@ -5,7 +5,7 @@
@@ -828,7 +828,7 @@ index 9b7eee7bf7..bb9170f13b 100644
828828
"crypto/internal/cryptotest"
829829
"crypto/md5"
830830
"crypto/sha1"
831-
@@ -584,8 +584,8 @@ func TestHMAC(t *testing.T) {
831+
@@ -597,8 +597,8 @@ func TestNoClone(t *testing.T) {
832832
}
833833

834834
func TestNonUniqueHash(t *testing.T) {
@@ -3717,7 +3717,7 @@ index 70055af70b..9d9204ff45 100644
37173717
}
37183718

37193719
diff --git a/src/crypto/internal/cryptotest/hash.go b/src/crypto/internal/cryptotest/hash.go
3720-
index f00e9c80d3..31c4ccea66 100644
3720+
index 37fd96a2d9..93563be163 100644
37213721
--- a/src/crypto/internal/cryptotest/hash.go
37223722
+++ b/src/crypto/internal/cryptotest/hash.go
37233723
@@ -5,7 +5,7 @@
@@ -3733,8 +3733,8 @@ index f00e9c80d3..31c4ccea66 100644
37333733
// TestHash performs a set of tests on hash.Hash implementations, checking the
37343734
// documented requirements of Write, Sum, Reset, Size, and BlockSize.
37353735
func TestHash(t *testing.T, mh MakeHash) {
3736-
- if boring.Enabled || fips140.Version() == "v1.0" {
3737-
+ if boring.Enabled() || fips140.Version() == "v1.0" {
3736+
- if boring.Enabled || fips140.Version() == "v1.0.0" {
3737+
+ if boring.Enabled() || fips140.Version() == "v1.0.0" {
37383738
testhash.TestHashWithoutClone(t, testhash.MakeHash(mh))
37393739
return
37403740
}
@@ -3761,7 +3761,7 @@ index f0ba665403..8c9b32e132 100644
37613761
return
37623762
}
37633763
diff --git a/src/crypto/internal/fips140test/fips_test.go b/src/crypto/internal/fips140test/fips_test.go
3764-
index 08d60933ef..8ee6c612cf 100644
3764+
index 52fc9d3488..2f5811fedb 100644
37653765
--- a/src/crypto/internal/fips140test/fips_test.go
37663766
+++ b/src/crypto/internal/fips140test/fips_test.go
37673767
@@ -15,7 +15,7 @@ package fipstest
@@ -3773,7 +3773,7 @@ index 08d60933ef..8ee6c612cf 100644
37733773
"crypto/internal/fips140"
37743774
"crypto/internal/fips140/aes"
37753775
"crypto/internal/fips140/aes/gcm"
3776-
@@ -92,7 +92,7 @@ func TestVersion(t *testing.T) {
3776+
@@ -90,7 +90,7 @@ func TestVersion(t *testing.T) {
37773777

37783778
func TestFIPS140(t *testing.T) {
37793779
moduleStatus(t)
@@ -4275,10 +4275,10 @@ index e03f4ab066..2a18d7a553 100644
42754275

42764276
// We don't check the specific error here, because crypto/rsa and crypto/internal/boring
42774277
diff --git a/src/crypto/rsa/rsa.go b/src/crypto/rsa/rsa.go
4278-
index 95bb4becd2..7b01e0b8b6 100644
4278+
index c557c3710a..66e6460eea 100644
42794279
--- a/src/crypto/rsa/rsa.go
42804280
+++ b/src/crypto/rsa/rsa.go
4281-
@@ -42,8 +42,8 @@ package rsa
4281+
@@ -43,8 +43,8 @@ package rsa
42824282

42834283
import (
42844284
"crypto"
@@ -4866,7 +4866,7 @@ index d3fa61dc97..ab18b84922 100644
48664866
return false
48674867
default:
48684868
diff --git a/src/crypto/tls/handshake_client_tls13.go b/src/crypto/tls/handshake_client_tls13.go
4869-
index 4f4966904f..8be6f5e737 100644
4869+
index 7018bb2336..7a9ca654c8 100644
48704870
--- a/src/crypto/tls/handshake_client_tls13.go
48714871
+++ b/src/crypto/tls/handshake_client_tls13.go
48724872
@@ -10,6 +10,7 @@ import (
@@ -4889,7 +4889,7 @@ index 4f4966904f..8be6f5e737 100644
48894889

48904890
// The server must not select TLS 1.3 in a renegotiation. See RFC 8446,
48914891
diff --git a/src/crypto/tls/handshake_server_tls13.go b/src/crypto/tls/handshake_server_tls13.go
4892-
index dbd6ff2c4f..32d2b2b047 100644
4892+
index 501bdeb66b..9203e2f8a6 100644
48934893
--- a/src/crypto/tls/handshake_server_tls13.go
48944894
+++ b/src/crypto/tls/handshake_server_tls13.go
48954895
@@ -10,6 +10,7 @@ import (
@@ -5240,10 +5240,10 @@ index 410eb8648a..3521b49a3e 100644
52405240
golang.org/x/crypto v0.39.0/go.mod h1:L+Xg3Wf6HoL4Bn4238Z6ft6KfEpN0tJGo53AAPC632U=
52415241
golang.org/x/net v0.41.0 h1:vBTly1HeNPEn3wtREYfy4GZ/NECgw2Cnl+nK6Nz3uvw=
52425242
diff --git a/src/go/build/deps_test.go b/src/go/build/deps_test.go
5243-
index 6d92542e31..859d69812a 100644
5243+
index 641d1a325a..1ac5f17fa8 100644
52445244
--- a/src/go/build/deps_test.go
52455245
+++ b/src/go/build/deps_test.go
5246-
@@ -828,6 +828,14 @@ func listStdPkgs(goroot string) ([]string, error) {
5246+
@@ -830,6 +830,14 @@ func listStdPkgs(goroot string) ([]string, error) {
52475247
}
52485248

52495249
func TestDependencies(t *testing.T) {
@@ -5302,7 +5302,7 @@ index 0000000000..0983612732
53025302
+const StrictFIPSRuntime = true
53035303
+const StrictFIPSRuntimeInt = 1
53045304
diff --git a/src/internal/goexperiment/flags.go b/src/internal/goexperiment/flags.go
5305-
index ceff24193d..7ce13d24e6 100644
5305+
index 63a3388839..61d8b2714d 100644
53065306
--- a/src/internal/goexperiment/flags.go
53075307
+++ b/src/internal/goexperiment/flags.go
53085308
@@ -129,4 +129,6 @@ type Flags struct {
@@ -12281,3 +12281,6 @@ index 8507f01b12..e7b583159e 100644
1228112281
# golang.org/x/crypto v0.39.0
1228212282
## explicit; go 1.23.0
1228312283
golang.org/x/crypto/chacha20
12284+
--
12285+
2.51.0
12286+

0 commit comments

Comments
 (0)