Update openssl backend

golang-fips · Feb 21, 2024 · 851f452 · 851f452
1 parent e868631
commit 851f452
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 16 deletions.
diff --git a/config/versions.json b/config/versions.json
@@ -1,5 +1,5 @@
 {
     "github.com/golang-fips/go": "main",
-    "github.com/golang-fips/openssl": "2f74c04ce90b331d31dc4dbd58678d7b7d046fbe",
+    "github.com/golang-fips/openssl": "576fe0d377882f8d0fd6537762ef2ff7918facc8",
     "github.com/golang/go": "go1.22.0"
 }
diff --git a/patches/001-initial-openssl-for-fips.patch b/patches/001-initial-openssl-for-fips.patch
@@ -3719,23 +3719,27 @@ index 910679756f..44ebc7c15f 100644
  	} else {
  		testCurve = elliptic.P384()
 diff --git a/src/go.mod b/src/go.mod
-index c18ae7760f..272d286121 100644
+index c18ae7760f..0cff10a255 100644
 --- a/src/go.mod
 +++ b/src/go.mod
 @@ -3,6 +3,7 @@ module std
  go 1.22
 
  require (
-+	github.com/golang-fips/openssl/v2 v2.0.0-rc.3.0.20240213175154-2f74c04ce90b
++	github.com/golang-fips/openssl/v2 v2.0.0-rc.3.0.20240221195800-576fe0d37788
  	golang.org/x/crypto v0.16.1-0.20231129163542-152cdb1503eb
  	golang.org/x/net v0.19.0
  )
-@@ -11,3 +12,5 @@ require (
- 	golang.org/x/sys v0.15.0 // indirect
- 	golang.org/x/text v0.14.0 // indirect
- )
-+
-+replace github.com/golang-fips/openssl/v2 => /src/openssl
+diff --git a/src/go.sum b/src/go.sum
+index 7c3519882a..40a8b2ac04 100644
+--- a/src/go.sum
++++ b/src/go.sum
+@@ -1,3 +1,5 @@
++github.com/golang-fips/openssl/v2 v2.0.0-rc.3.0.20240221195800-576fe0d37788 h1:YCg1cLYMq0/36XzGcVt8rqnNCFC4HwK19/h3lbgBymc=
++github.com/golang-fips/openssl/v2 v2.0.0-rc.3.0.20240221195800-576fe0d37788/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=
 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
@@ -9684,19 +9688,14 @@ index 0000000000..5de62f95a7
 +	return nil
 +}
 diff --git a/src/vendor/modules.txt b/src/vendor/modules.txt
-index 338c496bf9..c36ddb1e1c 100644
+index 338c496bf9..cae6a5f4fe 100644
 --- a/src/vendor/modules.txt
 +++ b/src/vendor/modules.txt
 @@ -1,3 +1,7 @@
-+# github.com/golang-fips/openssl/v2 v2.0.0-rc.3.0.20240213175154-2f74c04ce90b => /src/openssl
++# github.com/golang-fips/openssl/v2 v2.0.0-rc.3.0.20240221195800-576fe0d37788
 +## explicit; go 1.20
 +github.com/golang-fips/openssl/v2
 +github.com/golang-fips/openssl/v2/bbig
  # golang.org/x/crypto v0.16.1-0.20231129163542-152cdb1503eb
  ## explicit; go 1.18
  golang.org/x/crypto/chacha20
-@@ -26,3 +30,4 @@ golang.org/x/text/secure/bidirule
- golang.org/x/text/transform
- golang.org/x/text/unicode/bidi
- golang.org/x/text/unicode/norm
-+# github.com/golang-fips/openssl/v2 => /src/openssl