From 29f21ad45c5dcd0157f6f6319afb66ca88281975 Mon Sep 17 00:00:00 2001 From: poorndm Date: Fri, 9 Feb 2024 14:01:44 +0530 Subject: [PATCH 01/13] Openssl-patch to fix legacy error on 3.0.11 Signed-off-by: poorndm --- config/software/openssl.rb | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/config/software/openssl.rb b/config/software/openssl.rb index 2a6800f9b..0b852a77c 100644 --- a/config/software/openssl.rb +++ b/config/software/openssl.rb @@ -166,8 +166,15 @@ # Some of the algorithms which are being used are deprecated in OpenSSL3 and moved to legacy provider. # We need those algorithms for the working of chef-workstation and other packages. # This patch will enable the legacy providers! - configure_args << "enable-legacy" + if widows? + if version.equals 3.0.11 + configure_args << "enable-legacy" + patch source: openssl-3.0.11-enable-legacy-provider.patch + end + else + configure_args << "enable-legacy" patch source: "openssl-3.0.0-enable-legacy-provider.patch", env: patch_env + end if version.start_with?("1.0.2") && mac_os_x? && arm? From 3ec7aad111e1dbf43cb52515059fa10f4b1b011c Mon Sep 17 00:00:00 2001 From: poorndm Date: Fri, 9 Feb 2024 14:36:47 +0530 Subject: [PATCH 02/13] Sytax correction Signed-off-by: poorndm --- config/software/openssl.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/software/openssl.rb b/config/software/openssl.rb index 0b852a77c..b7c7c0b04 100644 --- a/config/software/openssl.rb +++ b/config/software/openssl.rb @@ -167,7 +167,7 @@ # We need those algorithms for the working of chef-workstation and other packages. # This patch will enable the legacy providers! if widows? - if version.equals 3.0.11 + if version.satisfies?("= 3.0.11) configure_args << "enable-legacy" patch source: openssl-3.0.11-enable-legacy-provider.patch end From fabaa82723acace8f76ef81363ac3d446518bc16 Mon Sep 17 00:00:00 2001 From: poorndm Date: Fri, 9 Feb 2024 14:43:55 +0530 Subject: [PATCH 03/13] Sytax correction Signed-off-by: poorndm --- config/software/openssl.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/software/openssl.rb b/config/software/openssl.rb index b7c7c0b04..42b8b7128 100644 --- a/config/software/openssl.rb +++ b/config/software/openssl.rb @@ -167,7 +167,7 @@ # We need those algorithms for the working of chef-workstation and other packages. # This patch will enable the legacy providers! if widows? - if version.satisfies?("= 3.0.11) + if version.satisfies?("= 3.0.11") configure_args << "enable-legacy" patch source: openssl-3.0.11-enable-legacy-provider.patch end From dac03bcb9f2311b55f476d459d2fe68159a045fd Mon Sep 17 00:00:00 2001 From: poorndm Date: Tue, 13 Feb 2024 12:23:39 +0530 Subject: [PATCH 04/13] modified patch file Signed-off-by: poorndm --- config/software/openssl.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/software/openssl.rb b/config/software/openssl.rb index 42b8b7128..7c09062c2 100644 --- a/config/software/openssl.rb +++ b/config/software/openssl.rb @@ -169,7 +169,7 @@ if widows? if version.satisfies?("= 3.0.11") configure_args << "enable-legacy" - patch source: openssl-3.0.11-enable-legacy-provider.patch + patch source: openssl-3-0-11-enable-legacy-provider.patch end else configure_args << "enable-legacy" From dd134f0b7a0e25303dd77e4485df23205166b35d Mon Sep 17 00:00:00 2001 From: poorndm Date: Tue, 13 Feb 2024 12:38:50 +0530 Subject: [PATCH 05/13] Fixing Indentation Signed-off-by: poorndm --- config/software/openssl.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/config/software/openssl.rb b/config/software/openssl.rb index 7c09062c2..e2157199a 100644 --- a/config/software/openssl.rb +++ b/config/software/openssl.rb @@ -167,14 +167,14 @@ # We need those algorithms for the working of chef-workstation and other packages. # This patch will enable the legacy providers! if widows? - if version.satisfies?("= 3.0.11") + if version.satisfies?("= 3.0.11") configure_args << "enable-legacy" patch source: openssl-3-0-11-enable-legacy-provider.patch end else - configure_args << "enable-legacy" + configure_args << "enable-legacy" patch source: "openssl-3.0.0-enable-legacy-provider.patch", env: patch_env - + end end if version.start_with?("1.0.2") && mac_os_x? && arm? From 0499d86df633dfa192528a66be0bf96c46b75ea9 Mon Sep 17 00:00:00 2001 From: poorndm Date: Tue, 13 Feb 2024 12:43:03 +0530 Subject: [PATCH 06/13] Fixing Indentation Signed-off-by: poorndm --- config/software/openssl.rb | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/config/software/openssl.rb b/config/software/openssl.rb index e2157199a..c64e55890 100644 --- a/config/software/openssl.rb +++ b/config/software/openssl.rb @@ -167,13 +167,13 @@ # We need those algorithms for the working of chef-workstation and other packages. # This patch will enable the legacy providers! if widows? - if version.satisfies?("= 3.0.11") - configure_args << "enable-legacy" - patch source: openssl-3-0-11-enable-legacy-provider.patch - end + if version.satisfies?("= 3.0.11") + configure_args << "enable-legacy" + patch source: openssl-3-0-11-enable-legacy-provider.patch + end else - configure_args << "enable-legacy" - patch source: "openssl-3.0.0-enable-legacy-provider.patch", env: patch_env + configure_args << "enable-legacy" + patch source: "openssl-3.0.0-enable-legacy-provider.patch", env: patch_env end end From 6f480110780cce96bde1e2a4d27486a964be7f7a Mon Sep 17 00:00:00 2001 From: poorndm Date: Tue, 13 Feb 2024 13:16:47 +0530 Subject: [PATCH 07/13] Fix Syntax errors Signed-off-by: poorndm --- config/software/openssl.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config/software/openssl.rb b/config/software/openssl.rb index c64e55890..108c94087 100644 --- a/config/software/openssl.rb +++ b/config/software/openssl.rb @@ -167,9 +167,9 @@ # We need those algorithms for the working of chef-workstation and other packages. # This patch will enable the legacy providers! if widows? - if version.satisfies?("= 3.0.11") + if version.start_with? "= 3.0.11" configure_args << "enable-legacy" - patch source: openssl-3-0-11-enable-legacy-provider.patch + patch source: "openssl-3-0-11-enable-legacy-provider.patch", env: patch_env end else configure_args << "enable-legacy" From 9e27882e37447d41042eb6131a31e94cda78d794 Mon Sep 17 00:00:00 2001 From: poorndm Date: Tue, 13 Feb 2024 13:44:51 +0530 Subject: [PATCH 08/13] Fix Syntax errors Signed-off-by: poorndm --- config/software/openssl.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/software/openssl.rb b/config/software/openssl.rb index 108c94087..d7052b968 100644 --- a/config/software/openssl.rb +++ b/config/software/openssl.rb @@ -167,7 +167,7 @@ # We need those algorithms for the working of chef-workstation and other packages. # This patch will enable the legacy providers! if widows? - if version.start_with? "= 3.0.11" + if version.start_with? "= 3.0.11" configure_args << "enable-legacy" patch source: "openssl-3-0-11-enable-legacy-provider.patch", env: patch_env end From 5032bc45f8aa5103020edd3a71b6950ce82b8747 Mon Sep 17 00:00:00 2001 From: poorndm Date: Tue, 13 Feb 2024 13:48:03 +0530 Subject: [PATCH 09/13] Fix Syntax errors Signed-off-by: poorndm --- config/software/openssl.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/software/openssl.rb b/config/software/openssl.rb index d7052b968..7d93a3327 100644 --- a/config/software/openssl.rb +++ b/config/software/openssl.rb @@ -172,7 +172,7 @@ patch source: "openssl-3-0-11-enable-legacy-provider.patch", env: patch_env end else - configure_args << "enable-legacy" + configure_args << "enable-legacy" patch source: "openssl-3.0.0-enable-legacy-provider.patch", env: patch_env end end From f41db502a20c512815ab3573275b54f60cd03b40 Mon Sep 17 00:00:00 2001 From: poorndm Date: Tue, 13 Feb 2024 13:53:52 +0530 Subject: [PATCH 10/13] Fix Syntax errors Signed-off-by: poorndm --- config/software/openssl.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/software/openssl.rb b/config/software/openssl.rb index 7d93a3327..93f3b6552 100644 --- a/config/software/openssl.rb +++ b/config/software/openssl.rb @@ -166,7 +166,7 @@ # Some of the algorithms which are being used are deprecated in OpenSSL3 and moved to legacy provider. # We need those algorithms for the working of chef-workstation and other packages. # This patch will enable the legacy providers! - if widows? + if windows? if version.start_with? "= 3.0.11" configure_args << "enable-legacy" patch source: "openssl-3-0-11-enable-legacy-provider.patch", env: patch_env From c77cfb4739654c87081f806cc8676c473e1af6c7 Mon Sep 17 00:00:00 2001 From: poorndm Date: Tue, 13 Feb 2024 19:47:55 +0530 Subject: [PATCH 11/13] Add openssl-patch 3.0.11 Signed-off-by: poorndm --- ...penssl-3-0-11-enable-legacy-provider.patch | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 config/patches/openssl/openssl-3-0-11-enable-legacy-provider.patch diff --git a/config/patches/openssl/openssl-3-0-11-enable-legacy-provider.patch b/config/patches/openssl/openssl-3-0-11-enable-legacy-provider.patch new file mode 100644 index 000000000..9c133b79e --- /dev/null +++ b/config/patches/openssl/openssl-3-0-11-enable-legacy-provider.patch @@ -0,0 +1,19 @@ +--- apps/openssl.cnf.org 2024-02-08 14:01:32 ++++ apps/openssl.cnf 2024-02-08 14:21:31 +@@ -56,6 +56,7 @@ + # List of providers to load + [provider_sect] + default = default_sect ++legacy = legacy_sect + # The fips section name should match the section name inside the + # included fipsmodule.cnf. + # fips = fips_sect +@@ -71,6 +72,8 @@ + [default_sect] + # activate = 1 + ++[legacy_sect] ++activate = 1 + + #################################################################### + [ ca ] From 89793116a68d6c2db3bfb4fc178e4af89ea32451 Mon Sep 17 00:00:00 2001 From: muthuja Date: Tue, 12 Mar 2024 13:57:40 +0530 Subject: [PATCH 12/13] adding check condition for openssl 3.0.9 Signed-off-by: muthuja --- ...der.patch => openssl-3-0-9-enable-legacy-provider.patch} | 0 config/software/openssl.rb | 6 ++++-- 2 files changed, 4 insertions(+), 2 deletions(-) rename config/patches/openssl/{openssl-3-0-11-enable-legacy-provider.patch => openssl-3-0-9-enable-legacy-provider.patch} (100%) diff --git a/config/patches/openssl/openssl-3-0-11-enable-legacy-provider.patch b/config/patches/openssl/openssl-3-0-9-enable-legacy-provider.patch similarity index 100% rename from config/patches/openssl/openssl-3-0-11-enable-legacy-provider.patch rename to config/patches/openssl/openssl-3-0-9-enable-legacy-provider.patch diff --git a/config/software/openssl.rb b/config/software/openssl.rb index 93f3b6552..f3f07ff50 100644 --- a/config/software/openssl.rb +++ b/config/software/openssl.rb @@ -167,9 +167,9 @@ # We need those algorithms for the working of chef-workstation and other packages. # This patch will enable the legacy providers! if windows? - if version.start_with? "= 3.0.11" + if version.start_with? "= 3.0.9" configure_args << "enable-legacy" - patch source: "openssl-3-0-11-enable-legacy-provider.patch", env: patch_env + patch source: "openssl-3-0-9-enable-legacy-provider.patch", env: patch_env end else configure_args << "enable-legacy" @@ -196,6 +196,8 @@ if version.start_with?("1.0.2") && windows? patch source: "openssl-1.0.1j-windows-relocate-dll.patch", env: env + elsif version.start_with?("3.0.9") && windows? + patch source: "openssl-3-0-9-enable-legacy-provider.patch", env: env end make "depend", env: env From e7e0c71d615e864c9da550c2d0d722b4133c4f6b Mon Sep 17 00:00:00 2001 From: muthuja Date: Wed, 13 Mar 2024 15:19:01 +0530 Subject: [PATCH 13/13] adding check condition for openssl 3.0.9 Signed-off-by: muthuja --- config/software/openssl.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/config/software/openssl.rb b/config/software/openssl.rb index f3f07ff50..b89d66931 100644 --- a/config/software/openssl.rb +++ b/config/software/openssl.rb @@ -197,6 +197,7 @@ if version.start_with?("1.0.2") && windows? patch source: "openssl-1.0.1j-windows-relocate-dll.patch", env: env elsif version.start_with?("3.0.9") && windows? + configure_args << "enable-legacy" patch source: "openssl-3-0-9-enable-legacy-provider.patch", env: env end