From 8cad2899a99a26fd54d2c6438f9abe9f0bcc20fa Mon Sep 17 00:00:00 2001 From: David Benoit Date: Tue, 7 Nov 2023 15:35:40 -0500 Subject: [PATCH] Update to Go 1.21.4 --- config/versions.json | 2 +- patches/001-initial-openssl-for-fips.patch | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/config/versions.json b/config/versions.json index ecd13ec66b..1c7ce26c52 100644 --- a/config/versions.json +++ b/config/versions.json @@ -1,5 +1,5 @@ { "github.com/golang-fips/go": "main", "github.com/golang-fips/openssl-fips": "b175be2ccd46683a51cba60a9a2087b09593317d", - "github.com/golang/go": "go1.21.3" + "github.com/golang/go": "go1.21.4" } diff --git a/patches/001-initial-openssl-for-fips.patch b/patches/001-initial-openssl-for-fips.patch index 7696b1d1f6..36e3861900 100644 --- a/patches/001-initial-openssl-for-fips.patch +++ b/patches/001-initial-openssl-for-fips.patch @@ -2348,7 +2348,7 @@ index 0c2cbf3182..e01c24292e 100644 } else { testCurve = elliptic.P384() diff --git a/src/go.mod b/src/go.mod -index 25829e17f2..e19ef07e84 100644 +index 3b24053b94..c4bc3c1e96 100644 --- a/src/go.mod +++ b/src/go.mod @@ -3,6 +3,7 @@ module std @@ -2357,10 +2357,10 @@ index 25829e17f2..e19ef07e84 100644 require ( + github.com/golang-fips/openssl-fips v0.0.0-20230801192317-b175be2ccd46 golang.org/x/crypto v0.11.1-0.20230711161743-2e82bdd1719d - golang.org/x/net v0.12.1-0.20230712162946-57553cbff163 + golang.org/x/net v0.12.1-0.20231027154334-5ca955b1789c ) diff --git a/src/go.sum b/src/go.sum -index e474b8be31..0dab3e78f9 100644 +index caf8ff010d..16a5d8c7da 100644 --- a/src/go.sum +++ b/src/go.sum @@ -1,3 +1,5 @@ @@ -2368,7 +2368,7 @@ index e474b8be31..0dab3e78f9 100644 +github.com/golang-fips/openssl-fips v0.0.0-20230801192317-b175be2ccd46/go.mod h1:V2IU8imz/VkScnIbTOrdYsZ5R88ZFypCE0LzhRJ3HsI= golang.org/x/crypto v0.11.1-0.20230711161743-2e82bdd1719d h1:LiA25/KWKuXfIq5pMIBq1s5hz3HQxhJJSu/SUGlD+SM= golang.org/x/crypto v0.11.1-0.20230711161743-2e82bdd1719d/go.mod h1:xgJhtzW8F9jGdVFWZESrid1U1bjeNy4zgy5cRr/CIio= - golang.org/x/net v0.12.1-0.20230712162946-57553cbff163 h1:1EDKNuaCsog7zGLEml1qRuO4gt23jORUQX2f0IKZ860= + golang.org/x/net v0.12.1-0.20231027154334-5ca955b1789c h1:d+VvAxu4S13DWtf73R5eY//VaCk3aUcVdyYjM1SX7zw= diff --git a/src/vendor/github.com/golang-fips/openssl-fips/LICENSE b/src/vendor/github.com/golang-fips/openssl-fips/LICENSE new file mode 100644 index 0000000000..97e8515401 @@ -7164,7 +7164,7 @@ index cf82f3f64f..0b55cedc91 100644 type sha512Ctx struct { diff --git a/src/vendor/modules.txt b/src/vendor/modules.txt -index 2b5f965f8f..25143a6ab0 100644 +index 4de656b0e8..273a9d49d6 100644 --- a/src/vendor/modules.txt +++ b/src/vendor/modules.txt @@ -1,3 +1,6 @@