diff --git a/download b/download index b16c04cb64d7b0ded0e198ed8e4924d23c844fcc..73e19c7a477d1c99e61efecfb1aa8a6a402df251 100644 --- a/download +++ b/download @@ -1,2 +1,2 @@ -2de4d5b2699dc91fd0786dd01a8f19d2 go1.20.10-1-openssl-fips.tar.gz -f86ca83067451ddbe885f1af887095b8 go1.20.10.tar.gz +2194ed2560ee3b2efe937bc3c7c3e2e0 go1.20.12-1-openssl-fips.tar.gz +15df1e4abd8a1eaa69ca79be9a9cded4 go1.20.12.tar.gz diff --git a/golang.spec b/golang.spec index 350b0aedb4000622dc22f515e26ff4214ec63539..1b8aeba976496118f3f15b15fe844d3f505a00d7 100644 --- a/golang.spec +++ b/golang.spec @@ -1,4 +1,4 @@ -%define anolis_release .0.2 +%define anolis_release .0.1 %undefine _missing_build_ids_terminate_build %global bcond_with strict_fips @@ -96,12 +96,12 @@ %endif %global go_api 1.20 -%global version 1.20.10 +%global version 1.20.12 %global pkg_release 1 Name: golang Version: %{version} -Release: 1%{anolis_release}%{?dist} +Release: 2%{anolis_release}%{?dist} Summary: The Go Programming Language # source tree includes several copies of Mark.Twain-Tom.Sawyer.txt under Public Domain @@ -147,6 +147,7 @@ Requires: diffutils # Proposed patch by jcajka https://golang.org/cl/86541 Patch221: fix_TestScript_list_std.patch +Patch222: skip-test-overlong-message.patch Patch1939923: skip_test_rhbz1939923.patch @@ -271,6 +272,7 @@ rm -rf loongarch64 %patch3 -p1 %patch221 -p1 +%patch222 -p1 %patch1939923 -p1 @@ -536,11 +538,18 @@ cd .. %endif %changelog -* Wed Jan 10 2024 Meidan Li - 1.20.10-1.0.2 -- Add LoongArch64 support. - -* Thu Dec 14 2023 Chang Gao - 1.20.10-1.0.1 +* Fri Feb 23 2024 Chang Gao - 1.20.12-2.0.1 - disable DISABLE_BoringCertAlgs_TEST test +- Add LoongArch64 support. (limeidan@loongson.cn) + +* Wed Dec 13 2023 David Benoit - 1.20.12-2 +- Fix sources file +- Related: RHEL-19231 + +* Tue Dec 12 2023 David Benoit - 1.20.12-1 +- Update to Go 1.20.12 +- Fix CVE-2023-39326 +- Resolves: RHEL-19231 * Fri Oct 13 2023 David Benoit - 1.20.10-1 - Update to Go 1.20.10 diff --git a/skip-test-overlong-message.patch b/skip-test-overlong-message.patch new file mode 100644 index 0000000000000000000000000000000000000000..1e143935a95f552d284085fe71609d9690bfa733 --- /dev/null +++ b/skip-test-overlong-message.patch @@ -0,0 +1,15 @@ +diff --git a/src/crypto/rsa/pkcs1v15_test.go b/src/crypto/rsa/pkcs1v15_test.go +index 0853178e3a..16eb37734b 100644 +--- a/src/crypto/rsa/pkcs1v15_test.go ++++ b/src/crypto/rsa/pkcs1v15_test.go +@@ -247,6 +247,10 @@ func TestVerifyPKCS1v15(t *testing.T) { + } + + func TestOverlongMessagePKCS1v15(t *testing.T) { ++ // OpenSSL now returns a random string instead of an error ++ if boring.Enabled() { ++ t.Skip("Not relevant in boring mode") ++ } + ciphertext := decodeBase64("fjOVdirUzFoLlukv80dBllMLjXythIf22feqPrNo0YoIjzyzyoMFiLjAc/Y4krkeZ11XFThIrEvw\nkRiZcCq5ng==") + _, err := DecryptPKCS1v15(nil, rsaPrivateKey, ciphertext) + if err == nil {