Skip to content

Fix test failure in OpenSSL #3368

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Camelron merged 2 commits into from
Aug 2, 2022
Merged

Fix test failure in OpenSSL #3368

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c8dad2b
Remove patch to eng_all.c
mamckee Jul 13, 2022
84eaacb
Increment openssl package number
mamckee Jul 13, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 0 additions & 17 deletions SPECS/openssl/openssl-1.1.1-load-default-engines.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
5 changes: 4 additions & 1 deletion SPECS/openssl/openssl.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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 <mamckee@microsoft.com> - 1.1.1k-19
- Removed portion of load-default-engines test causing unit test failure

* Tue Jul 05 2022 Maxwell Moyer-McKee <mamckee@microsoft.com> - 1.1.1k-18
- Add optional patch to use KeysInUse as default engine

Expand Down
10 changes: 5 additions & 5 deletions toolkit/resources/manifests/package/pkggen_core_aarch64.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
10 changes: 5 additions & 5 deletions toolkit/resources/manifests/package/pkggen_core_x86_64.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
12 changes: 6 additions & 6 deletions toolkit/resources/manifests/package/toolchain_aarch64.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
12 changes: 6 additions & 6 deletions toolkit/resources/manifests/package/toolchain_x86_64.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down