Skip to content

[AUTO-CHERRYPICK] Revert "Patch openssl for PKCS12_item_decrypt_d2i_ex(): Check oct argument for NULL" - branch main #16163

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
CBL-Mariner-Bot merged 1 commit into from
Mar 11, 2026
Merged

[AUTO-CHERRYPICK] Revert "Patch openssl for PKCS12_item_decrypt_d2i_ex(): Check oct argument for NULL" - branch main #16163

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
44 changes: 0 additions & 44 deletions SPECS/openssl/openssl-1.1.1-check-oct-argument-for-NULL.patch
View file
Open in desktop

This file was deleted.

6 changes: 1 addition & 5 deletions 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: 39%{?dist}
Release: 38%{?dist}
License: OpenSSL
Vendor: Microsoft Corporation
Distribution: Mariner
Expand Down Expand Up @@ -72,7 +72,6 @@ Patch48: openssl-1.1.1-fix-heap-buffer-overflow-in-BIO_f_linebuffer.patch
Patch49: openssl-1.1.1-fix-OCB-AES-NI-HW-stream-path-unauthenticated-unencrypted.patch
Patch50: openssl-1.1.1-check-return-code-of-UTF8_putc.patch
Patch51: openssl-1.1.1-verify-ASN1-objects-types.patch
Patch52: openssl-1.1.1-check-oct-argument-for-NULL.patch

BuildRequires: perl-Test-Warnings
BuildRequires: perl-Text-Template
Expand Down Expand Up @@ -336,9 +335,6 @@ rm -f %{buildroot}%{_sysconfdir}/pki/tls/ct_log_list.cnf.dist
%postun libs -p /sbin/ldconfig

%changelog
* Tue Mar 03 2026 Archana Shettigar <v-shettigara@microsoft.com> - 1.1.1k-39
- Patch PKCS12_item_decrypt_d2i_ex(): Check oct argument for NULL

* Fri Feb 20 2026 Kanishk Bansal <kanbansal@microsoft.com> - 1.1.1k-38
- Ensure ASN1 types are checked before use in s_client, PKCS12, and PKCS7
- Fix heap buffer overflow in BIO_f_linebuffer on short writes
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-39.cm2.aarch64.rpm
openssl-devel-1.1.1k-39.cm2.aarch64.rpm
openssl-libs-1.1.1k-39.cm2.aarch64.rpm
openssl-perl-1.1.1k-39.cm2.aarch64.rpm
openssl-static-1.1.1k-39.cm2.aarch64.rpm
openssl-1.1.1k-38.cm2.aarch64.rpm
openssl-devel-1.1.1k-38.cm2.aarch64.rpm
openssl-libs-1.1.1k-38.cm2.aarch64.rpm
openssl-perl-1.1.1k-38.cm2.aarch64.rpm
openssl-static-1.1.1k-38.cm2.aarch64.rpm
libcap-2.60-7.cm2.aarch64.rpm
libcap-devel-2.60-7.cm2.aarch64.rpm
debugedit-5.0-2.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-39.cm2.x86_64.rpm
openssl-devel-1.1.1k-39.cm2.x86_64.rpm
openssl-libs-1.1.1k-39.cm2.x86_64.rpm
openssl-perl-1.1.1k-39.cm2.x86_64.rpm
openssl-static-1.1.1k-39.cm2.x86_64.rpm
openssl-1.1.1k-38.cm2.x86_64.rpm
openssl-devel-1.1.1k-38.cm2.x86_64.rpm
openssl-libs-1.1.1k-38.cm2.x86_64.rpm
openssl-perl-1.1.1k-38.cm2.x86_64.rpm
openssl-static-1.1.1k-38.cm2.x86_64.rpm
libcap-2.60-7.cm2.x86_64.rpm
libcap-devel-2.60-7.cm2.x86_64.rpm
debugedit-5.0-2.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 @@ -270,12 +270,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-4.cm2.aarch64.rpm
openssl-1.1.1k-39.cm2.aarch64.rpm
openssl-debuginfo-1.1.1k-39.cm2.aarch64.rpm
openssl-devel-1.1.1k-39.cm2.aarch64.rpm
openssl-libs-1.1.1k-39.cm2.aarch64.rpm
openssl-perl-1.1.1k-39.cm2.aarch64.rpm
openssl-static-1.1.1k-39.cm2.aarch64.rpm
openssl-1.1.1k-38.cm2.aarch64.rpm
openssl-debuginfo-1.1.1k-38.cm2.aarch64.rpm
openssl-devel-1.1.1k-38.cm2.aarch64.rpm
openssl-libs-1.1.1k-38.cm2.aarch64.rpm
openssl-perl-1.1.1k-38.cm2.aarch64.rpm
openssl-static-1.1.1k-38.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 @@ -276,12 +276,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-4.cm2.x86_64.rpm
openssl-1.1.1k-39.cm2.x86_64.rpm
openssl-debuginfo-1.1.1k-39.cm2.x86_64.rpm
openssl-devel-1.1.1k-39.cm2.x86_64.rpm
openssl-libs-1.1.1k-39.cm2.x86_64.rpm
openssl-perl-1.1.1k-39.cm2.x86_64.rpm
openssl-static-1.1.1k-39.cm2.x86_64.rpm
openssl-1.1.1k-38.cm2.x86_64.rpm
openssl-debuginfo-1.1.1k-38.cm2.x86_64.rpm
openssl-devel-1.1.1k-38.cm2.x86_64.rpm
openssl-libs-1.1.1k-38.cm2.x86_64.rpm
openssl-perl-1.1.1k-38.cm2.x86_64.rpm
openssl-static-1.1.1k-38.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
Loading