Skip to content

Commit 556abee

Browse files
authored
Rebase to 1.22.2 (#179)
1 parent b8599ec commit 556abee

File tree

2 files changed

+9
-9
lines changed

2 files changed

+9
-9
lines changed

config/versions.json

+1-1
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": "85d31d0d257ce842c8a1e63c4d230ae850348136",
4-
"github.com/golang/go": "go1.22.1"
4+
"github.com/golang/go": "go1.22.2"
55
}

patches/001-initial-openssl-for-fips.patch

+8-8
Original file line numberDiff line numberDiff line change
@@ -3688,7 +3688,7 @@ index c83a7272c9..0c7dea2f1f 100644
36883688
package x509
36893689

36903690
diff --git a/src/crypto/x509/x509_test.go b/src/crypto/x509/x509_test.go
3691-
index 910679756f..44ebc7c15f 100644
3691+
index 3c592e1136..a594823783 100644
36923692
--- a/src/crypto/x509/x509_test.go
36933693
+++ b/src/crypto/x509/x509_test.go
36943694
@@ -12,7 +12,7 @@ import (
@@ -3700,7 +3700,7 @@ index 910679756f..44ebc7c15f 100644
37003700
"crypto/internal/backend/boringtest"
37013701
"crypto/rand"
37023702
"crypto/rsa"
3703-
@@ -655,7 +655,7 @@ func TestCreateSelfSignedCertificate(t *testing.T) {
3703+
@@ -656,7 +656,7 @@ func TestCreateSelfSignedCertificate(t *testing.T) {
37043704
extraExtensionData := []byte("extra extension")
37053705

37063706
for _, test := range tests {
@@ -3709,7 +3709,7 @@ index 910679756f..44ebc7c15f 100644
37093709
key, _ := test.priv.(*rsa.PrivateKey)
37103710
if key.PublicKey.N.BitLen() < 2048 {
37113711
t.Logf("skipping short key with BoringCrypto: %d", key.PublicKey.N.BitLen())
3712-
@@ -3719,7 +3719,7 @@ func TestRevocationListCheckSignatureFrom(t *testing.T) {
3712+
@@ -3720,7 +3720,7 @@ func TestRevocationListCheckSignatureFrom(t *testing.T) {
37133713
var testCurve elliptic.Curve
37143714
// If OpenSSL supports P224, use the default upstream behavior,
37153715
// otherwise test with P384
@@ -3719,7 +3719,7 @@ index 910679756f..44ebc7c15f 100644
37193719
} else {
37203720
testCurve = elliptic.P384()
37213721
diff --git a/src/go.mod b/src/go.mod
3722-
index c18ae7760f..12a1a3a4d6 100644
3722+
index 04bb1b358c..b656ad46ce 100644
37233723
--- a/src/go.mod
37243724
+++ b/src/go.mod
37253725
@@ -3,6 +3,7 @@ module std
@@ -3728,18 +3728,18 @@ index c18ae7760f..12a1a3a4d6 100644
37283728
require (
37293729
+ github.com/golang-fips/openssl/v2 v2.0.1
37303730
golang.org/x/crypto v0.16.1-0.20231129163542-152cdb1503eb
3731-
golang.org/x/net v0.19.0
3731+
golang.org/x/net v0.19.1-0.20240327214321-ae3c50b55fdf
37323732
)
37333733
diff --git a/src/go.sum b/src/go.sum
3734-
index 7c3519882a..aeb3130373 100644
3734+
index 28d7841926..6454ac2934 100644
37353735
--- a/src/go.sum
37363736
+++ b/src/go.sum
37373737
@@ -1,3 +1,5 @@
37383738
+github.com/golang-fips/openssl/v2 v2.0.1 h1:oNIu7tARUHmSIY7Gqn5lbSCnHSduvkFJoM2FRq294lA=
37393739
+github.com/golang-fips/openssl/v2 v2.0.1/go.mod h1:7tuBqX2Zov8Yq5mJ2yzlKhpnxOnWyEzi38AzeWRuQdg=
37403740
golang.org/x/crypto v0.16.1-0.20231129163542-152cdb1503eb h1:1ceSY7sk6sJuiDREHpfyrqDnDljsLfEP2GuTClhBBfI=
37413741
golang.org/x/crypto v0.16.1-0.20231129163542-152cdb1503eb/go.mod h1:gCAAfMLgwOJRpTjQ2zCCt2OcSfYMTeZVSRtQlPC7Nq4=
3742-
golang.org/x/net v0.19.0 h1:zTwKpTd2XuCqf8huc7Fo2iSy+4RHPd10s4KzeTnVr1c=
3742+
golang.org/x/net v0.19.1-0.20240327214321-ae3c50b55fdf h1:zcMReZfxLPmppTre5oSNPSOgoTRtOplx+QV25LkyAto=
37433743
diff --git a/src/vendor/github.com/golang-fips/openssl/v2/.gitleaks.toml b/src/vendor/github.com/golang-fips/openssl/v2/.gitleaks.toml
37443744
new file mode 100644
37453745
index 0000000000..aed2e22df2
@@ -9688,7 +9688,7 @@ index 0000000000..5de62f95a7
96889688
+ return nil
96899689
+}
96909690
diff --git a/src/vendor/modules.txt b/src/vendor/modules.txt
9691-
index 338c496bf9..187322fab6 100644
9691+
index 8c555d28c5..1c8b73a529 100644
96929692
--- a/src/vendor/modules.txt
96939693
+++ b/src/vendor/modules.txt
96949694
@@ -1,3 +1,7 @@

0 commit comments

Comments
 (0)