diff --git a/SPECS/openssl/openssl-1.1.1-load-default-engines.patch b/SPECS/openssl/openssl-1.1.1-load-default-engines.patch index ab7b7a54be4..fccec5c9f36 100644 --- a/SPECS/openssl/openssl-1.1.1-load-default-engines.patch +++ b/SPECS/openssl/openssl-1.1.1-load-default-engines.patch @@ -1,20 +1,3 @@ -diff --git a/crypto/engine/eng_all.c b/crypto/engine/eng_all.c -index b675ed7892..b7abf3d61f 100644 ---- a/crypto/engine/eng_all.c -+++ b/crypto/engine/eng_all.c -@@ -10,6 +10,12 @@ - #include "internal/cryptlib.h" - #include "eng_local.h" - -+ __attribute__((constructor)) -+void ENGINE_static_initializer(void) -+{ -+ OPENSSL_init_crypto(OPENSSL_INIT_ENGINE_DYNAMIC, NULL); -+} -+ - void ENGINE_load_builtin_engines(void) - { - /* Some ENGINEs need this */ diff --git a/crypto/init.c b/crypto/init.c index 1b0d523bea..86e31c193e 100644 --- a/crypto/init.c diff --git a/SPECS/openssl/openssl.spec b/SPECS/openssl/openssl.spec index a1e28a27314..20b37886a5f 100644 --- a/SPECS/openssl/openssl.spec +++ b/SPECS/openssl/openssl.spec @@ -4,7 +4,7 @@ Summary: Utilities from the general purpose cryptography library with TLS implementation Name: openssl Version: 1.1.1k -Release: 18%{?dist} +Release: 19%{?dist} License: OpenSSL Vendor: Microsoft Corporation Distribution: Mariner @@ -339,6 +339,9 @@ rm -f %{buildroot}%{_sysconfdir}/pki/tls/ct_log_list.cnf.dist %postun libs -p /sbin/ldconfig %changelog +* Wed Jul 13 2022 Maxwell Moyer-McKee - 1.1.1k-19 +- Removed portion of load-default-engines test causing unit test failure + * Tue Jul 05 2022 Maxwell Moyer-McKee - 1.1.1k-18 - Add optional patch to use KeysInUse as default engine diff --git a/toolkit/resources/manifests/package/pkggen_core_aarch64.txt b/toolkit/resources/manifests/package/pkggen_core_aarch64.txt index 16d5ca368b9..a360f1d269e 100644 --- a/toolkit/resources/manifests/package/pkggen_core_aarch64.txt +++ b/toolkit/resources/manifests/package/pkggen_core_aarch64.txt @@ -165,11 +165,11 @@ texinfo-6.8-1.cm2.aarch64.rpm gtk-doc-1.33.2-1.cm2.noarch.rpm autoconf-2.71-3.cm2.noarch.rpm automake-1.16.5-1.cm2.noarch.rpm -openssl-1.1.1k-18.cm2.aarch64.rpm -openssl-devel-1.1.1k-18.cm2.aarch64.rpm -openssl-libs-1.1.1k-18.cm2.aarch64.rpm -openssl-perl-1.1.1k-18.cm2.aarch64.rpm -openssl-static-1.1.1k-18.cm2.aarch64.rpm +openssl-1.1.1k-19.cm2.aarch64.rpm +openssl-devel-1.1.1k-19.cm2.aarch64.rpm +openssl-libs-1.1.1k-19.cm2.aarch64.rpm +openssl-perl-1.1.1k-19.cm2.aarch64.rpm +openssl-static-1.1.1k-19.cm2.aarch64.rpm libcap-2.60-1.cm2.aarch64.rpm libcap-devel-2.60-1.cm2.aarch64.rpm debugedit-5.0-1.cm2.aarch64.rpm diff --git a/toolkit/resources/manifests/package/pkggen_core_x86_64.txt b/toolkit/resources/manifests/package/pkggen_core_x86_64.txt index d8bc8054e14..08496d40b0a 100644 --- a/toolkit/resources/manifests/package/pkggen_core_x86_64.txt +++ b/toolkit/resources/manifests/package/pkggen_core_x86_64.txt @@ -165,11 +165,11 @@ texinfo-6.8-1.cm2.x86_64.rpm gtk-doc-1.33.2-1.cm2.noarch.rpm autoconf-2.71-3.cm2.noarch.rpm automake-1.16.5-1.cm2.noarch.rpm -openssl-1.1.1k-18.cm2.x86_64.rpm -openssl-devel-1.1.1k-18.cm2.x86_64.rpm -openssl-libs-1.1.1k-18.cm2.x86_64.rpm -openssl-perl-1.1.1k-18.cm2.x86_64.rpm -openssl-static-1.1.1k-18.cm2.x86_64.rpm +openssl-1.1.1k-19.cm2.x86_64.rpm +openssl-devel-1.1.1k-19.cm2.x86_64.rpm +openssl-libs-1.1.1k-19.cm2.x86_64.rpm +openssl-perl-1.1.1k-19.cm2.x86_64.rpm +openssl-static-1.1.1k-19.cm2.x86_64.rpm libcap-2.60-1.cm2.x86_64.rpm libcap-devel-2.60-1.cm2.x86_64.rpm debugedit-5.0-1.cm2.x86_64.rpm diff --git a/toolkit/resources/manifests/package/toolchain_aarch64.txt b/toolkit/resources/manifests/package/toolchain_aarch64.txt index e7d533e894c..da57e1954cf 100644 --- a/toolkit/resources/manifests/package/toolchain_aarch64.txt +++ b/toolkit/resources/manifests/package/toolchain_aarch64.txt @@ -259,12 +259,12 @@ npth-1.6-4.cm2.aarch64.rpm npth-debuginfo-1.6-4.cm2.aarch64.rpm npth-devel-1.6-4.cm2.aarch64.rpm ntsysv-1.20-3.cm2.aarch64.rpm -openssl-1.1.1k-18.cm2.aarch64.rpm -openssl-debuginfo-1.1.1k-18.cm2.aarch64.rpm -openssl-devel-1.1.1k-18.cm2.aarch64.rpm -openssl-libs-1.1.1k-18.cm2.aarch64.rpm -openssl-perl-1.1.1k-18.cm2.aarch64.rpm -openssl-static-1.1.1k-18.cm2.aarch64.rpm +openssl-1.1.1k-19.cm2.aarch64.rpm +openssl-debuginfo-1.1.1k-19.cm2.aarch64.rpm +openssl-devel-1.1.1k-19.cm2.aarch64.rpm +openssl-libs-1.1.1k-19.cm2.aarch64.rpm +openssl-perl-1.1.1k-19.cm2.aarch64.rpm +openssl-static-1.1.1k-19.cm2.aarch64.rpm p11-kit-0.24.1-1.cm2.aarch64.rpm p11-kit-debuginfo-0.24.1-1.cm2.aarch64.rpm p11-kit-devel-0.24.1-1.cm2.aarch64.rpm diff --git a/toolkit/resources/manifests/package/toolchain_x86_64.txt b/toolkit/resources/manifests/package/toolchain_x86_64.txt index 325b670cf44..bfe1c856136 100644 --- a/toolkit/resources/manifests/package/toolchain_x86_64.txt +++ b/toolkit/resources/manifests/package/toolchain_x86_64.txt @@ -259,12 +259,12 @@ npth-1.6-4.cm2.x86_64.rpm npth-debuginfo-1.6-4.cm2.x86_64.rpm npth-devel-1.6-4.cm2.x86_64.rpm ntsysv-1.20-3.cm2.x86_64.rpm -openssl-1.1.1k-18.cm2.x86_64.rpm -openssl-debuginfo-1.1.1k-18.cm2.x86_64.rpm -openssl-devel-1.1.1k-18.cm2.x86_64.rpm -openssl-libs-1.1.1k-18.cm2.x86_64.rpm -openssl-perl-1.1.1k-18.cm2.x86_64.rpm -openssl-static-1.1.1k-18.cm2.x86_64.rpm +openssl-1.1.1k-19.cm2.x86_64.rpm +openssl-debuginfo-1.1.1k-19.cm2.x86_64.rpm +openssl-devel-1.1.1k-19.cm2.x86_64.rpm +openssl-libs-1.1.1k-19.cm2.x86_64.rpm +openssl-perl-1.1.1k-19.cm2.x86_64.rpm +openssl-static-1.1.1k-19.cm2.x86_64.rpm p11-kit-0.24.1-1.cm2.x86_64.rpm p11-kit-debuginfo-0.24.1-1.cm2.x86_64.rpm p11-kit-devel-0.24.1-1.cm2.x86_64.rpm