Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rebase to 1.22.2 #179

Merged
merged 1 commit into from
Apr 4, 2024
Merged

Rebase to 1.22.2 #179

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion config/versions.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"github.com/golang-fips/go": "main",
"github.com/golang-fips/openssl": "85d31d0d257ce842c8a1e63c4d230ae850348136",
"github.com/golang/go": "go1.22.1"
"github.com/golang/go": "go1.22.2"
}
16 changes: 8 additions & 8 deletions patches/001-initial-openssl-for-fips.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3688,7 +3688,7 @@ index c83a7272c9..0c7dea2f1f 100644
package x509

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

for _, test := range tests {
Expand All @@ -3709,7 +3709,7 @@ index 910679756f..44ebc7c15f 100644
key, _ := test.priv.(*rsa.PrivateKey)
if key.PublicKey.N.BitLen() < 2048 {
t.Logf("skipping short key with BoringCrypto: %d", key.PublicKey.N.BitLen())
@@ -3719,7 +3719,7 @@ func TestRevocationListCheckSignatureFrom(t *testing.T) {
@@ -3720,7 +3720,7 @@ func TestRevocationListCheckSignatureFrom(t *testing.T) {
var testCurve elliptic.Curve
// If OpenSSL supports P224, use the default upstream behavior,
// otherwise test with P384
Expand All @@ -3719,7 +3719,7 @@ index 910679756f..44ebc7c15f 100644
} else {
testCurve = elliptic.P384()
diff --git a/src/go.mod b/src/go.mod
index c18ae7760f..12a1a3a4d6 100644
index 04bb1b358c..b656ad46ce 100644
--- a/src/go.mod
+++ b/src/go.mod
@@ -3,6 +3,7 @@ module std
Expand All @@ -3728,18 +3728,18 @@ index c18ae7760f..12a1a3a4d6 100644
require (
+ github.com/golang-fips/openssl/v2 v2.0.1
golang.org/x/crypto v0.16.1-0.20231129163542-152cdb1503eb
golang.org/x/net v0.19.0
golang.org/x/net v0.19.1-0.20240327214321-ae3c50b55fdf
)
diff --git a/src/go.sum b/src/go.sum
index 7c3519882a..aeb3130373 100644
index 28d7841926..6454ac2934 100644
--- a/src/go.sum
+++ b/src/go.sum
@@ -1,3 +1,5 @@
+github.com/golang-fips/openssl/v2 v2.0.1 h1:oNIu7tARUHmSIY7Gqn5lbSCnHSduvkFJoM2FRq294lA=
+github.com/golang-fips/openssl/v2 v2.0.1/go.mod h1:7tuBqX2Zov8Yq5mJ2yzlKhpnxOnWyEzi38AzeWRuQdg=
golang.org/x/crypto v0.16.1-0.20231129163542-152cdb1503eb h1:1ceSY7sk6sJuiDREHpfyrqDnDljsLfEP2GuTClhBBfI=
golang.org/x/crypto v0.16.1-0.20231129163542-152cdb1503eb/go.mod h1:gCAAfMLgwOJRpTjQ2zCCt2OcSfYMTeZVSRtQlPC7Nq4=
golang.org/x/net v0.19.0 h1:zTwKpTd2XuCqf8huc7Fo2iSy+4RHPd10s4KzeTnVr1c=
golang.org/x/net v0.19.1-0.20240327214321-ae3c50b55fdf h1:zcMReZfxLPmppTre5oSNPSOgoTRtOplx+QV25LkyAto=
diff --git a/src/vendor/github.com/golang-fips/openssl/v2/.gitleaks.toml b/src/vendor/github.com/golang-fips/openssl/v2/.gitleaks.toml
new file mode 100644
index 0000000000..aed2e22df2
Expand Down Expand Up @@ -9688,7 +9688,7 @@ index 0000000000..5de62f95a7
+ return nil
+}
diff --git a/src/vendor/modules.txt b/src/vendor/modules.txt
index 338c496bf9..187322fab6 100644
index 8c555d28c5..1c8b73a529 100644
--- a/src/vendor/modules.txt
+++ b/src/vendor/modules.txt
@@ -1,3 +1,7 @@
Expand Down
Loading