Skip to content

Commit a80826b

Browse files
CBL-Mariner-Botsuresh-thelkarSuresh Thelkar
authored
[AUTO-CHERRYPICK] Bug fix in patch CVE-2024-5535 in openssl - branch main (#9961)
Co-authored-by: suresh-thelkar <suresh.thelkar@yahoo.com> Co-authored-by: Suresh Thelkar <sthelkar@microsoft.com>
1 parent 37ec872 commit a80826b

5 files changed

Lines changed: 27 additions & 23 deletions

File tree

SPECS/openssl/openssl.spec

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
Summary: Utilities from the general purpose cryptography library with TLS implementation
55
Name: openssl
66
Version: 1.1.1k
7-
Release: 34%{?dist}
7+
Release: 35%{?dist}
88
License: OpenSSL
99
Vendor: Microsoft Corporation
1010
Distribution: Mariner
@@ -181,6 +181,7 @@ cp %{SOURCE4} test/
181181
%patch41 -p1
182182
%patch42 -p1
183183
%patch43 -p1
184+
%patch44 -p1
184185

185186
%build
186187
# Add -Wa,--noexecstack here so that libcrypto's assembler modules will be
@@ -370,6 +371,9 @@ rm -f %{buildroot}%{_sysconfdir}/pki/tls/ct_log_list.cnf.dist
370371
%postun libs -p /sbin/ldconfig
371372

372373
%changelog
374+
* Mon Jul 29 2024 Suresh Thelkar <sthelkar@microsoft.com> - 1.1.1k-35
375+
- Bug fix for the Patch CVE-2024-5535
376+
373377
* Mon Jul 22 2024 Suresh Thelkar <sthelkar@microsoft.com> - 1.1.1k-34
374378
- Patch CVE-2024-5535
375379

toolkit/resources/manifests/package/pkggen_core_aarch64.txt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -165,11 +165,11 @@ texinfo-6.8-1.cm2.aarch64.rpm
165165
gtk-doc-1.33.2-1.cm2.noarch.rpm
166166
autoconf-2.71-3.cm2.noarch.rpm
167167
automake-1.16.5-1.cm2.noarch.rpm
168-
openssl-1.1.1k-34.cm2.aarch64.rpm
169-
openssl-devel-1.1.1k-34.cm2.aarch64.rpm
170-
openssl-libs-1.1.1k-34.cm2.aarch64.rpm
171-
openssl-perl-1.1.1k-34.cm2.aarch64.rpm
172-
openssl-static-1.1.1k-34.cm2.aarch64.rpm
168+
openssl-1.1.1k-35.cm2.aarch64.rpm
169+
openssl-devel-1.1.1k-35.cm2.aarch64.rpm
170+
openssl-libs-1.1.1k-35.cm2.aarch64.rpm
171+
openssl-perl-1.1.1k-35.cm2.aarch64.rpm
172+
openssl-static-1.1.1k-35.cm2.aarch64.rpm
173173
libcap-2.60-2.cm2.aarch64.rpm
174174
libcap-devel-2.60-2.cm2.aarch64.rpm
175175
debugedit-5.0-2.cm2.aarch64.rpm

toolkit/resources/manifests/package/pkggen_core_x86_64.txt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -165,11 +165,11 @@ texinfo-6.8-1.cm2.x86_64.rpm
165165
gtk-doc-1.33.2-1.cm2.noarch.rpm
166166
autoconf-2.71-3.cm2.noarch.rpm
167167
automake-1.16.5-1.cm2.noarch.rpm
168-
openssl-1.1.1k-34.cm2.x86_64.rpm
169-
openssl-devel-1.1.1k-34.cm2.x86_64.rpm
170-
openssl-libs-1.1.1k-34.cm2.x86_64.rpm
171-
openssl-perl-1.1.1k-34.cm2.x86_64.rpm
172-
openssl-static-1.1.1k-34.cm2.x86_64.rpm
168+
openssl-1.1.1k-35.cm2.x86_64.rpm
169+
openssl-devel-1.1.1k-35.cm2.x86_64.rpm
170+
openssl-libs-1.1.1k-35.cm2.x86_64.rpm
171+
openssl-perl-1.1.1k-35.cm2.x86_64.rpm
172+
openssl-static-1.1.1k-35.cm2.x86_64.rpm
173173
libcap-2.60-2.cm2.x86_64.rpm
174174
libcap-devel-2.60-2.cm2.x86_64.rpm
175175
debugedit-5.0-2.cm2.x86_64.rpm

toolkit/resources/manifests/package/toolchain_aarch64.txt

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -270,12 +270,12 @@ npth-1.6-4.cm2.aarch64.rpm
270270
npth-debuginfo-1.6-4.cm2.aarch64.rpm
271271
npth-devel-1.6-4.cm2.aarch64.rpm
272272
ntsysv-1.20-4.cm2.aarch64.rpm
273-
openssl-1.1.1k-34.cm2.aarch64.rpm
274-
openssl-debuginfo-1.1.1k-34.cm2.aarch64.rpm
275-
openssl-devel-1.1.1k-34.cm2.aarch64.rpm
276-
openssl-libs-1.1.1k-34.cm2.aarch64.rpm
277-
openssl-perl-1.1.1k-34.cm2.aarch64.rpm
278-
openssl-static-1.1.1k-34.cm2.aarch64.rpm
273+
openssl-1.1.1k-35.cm2.aarch64.rpm
274+
openssl-debuginfo-1.1.1k-35.cm2.aarch64.rpm
275+
openssl-devel-1.1.1k-35.cm2.aarch64.rpm
276+
openssl-libs-1.1.1k-35.cm2.aarch64.rpm
277+
openssl-perl-1.1.1k-35.cm2.aarch64.rpm
278+
openssl-static-1.1.1k-35.cm2.aarch64.rpm
279279
p11-kit-0.24.1-1.cm2.aarch64.rpm
280280
p11-kit-debuginfo-0.24.1-1.cm2.aarch64.rpm
281281
p11-kit-devel-0.24.1-1.cm2.aarch64.rpm

toolkit/resources/manifests/package/toolchain_x86_64.txt

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -276,12 +276,12 @@ npth-1.6-4.cm2.x86_64.rpm
276276
npth-debuginfo-1.6-4.cm2.x86_64.rpm
277277
npth-devel-1.6-4.cm2.x86_64.rpm
278278
ntsysv-1.20-4.cm2.x86_64.rpm
279-
openssl-1.1.1k-34.cm2.x86_64.rpm
280-
openssl-debuginfo-1.1.1k-34.cm2.x86_64.rpm
281-
openssl-devel-1.1.1k-34.cm2.x86_64.rpm
282-
openssl-libs-1.1.1k-34.cm2.x86_64.rpm
283-
openssl-perl-1.1.1k-34.cm2.x86_64.rpm
284-
openssl-static-1.1.1k-34.cm2.x86_64.rpm
279+
openssl-1.1.1k-35.cm2.x86_64.rpm
280+
openssl-debuginfo-1.1.1k-35.cm2.x86_64.rpm
281+
openssl-devel-1.1.1k-35.cm2.x86_64.rpm
282+
openssl-libs-1.1.1k-35.cm2.x86_64.rpm
283+
openssl-perl-1.1.1k-35.cm2.x86_64.rpm
284+
openssl-static-1.1.1k-35.cm2.x86_64.rpm
285285
p11-kit-0.24.1-1.cm2.x86_64.rpm
286286
p11-kit-debuginfo-0.24.1-1.cm2.x86_64.rpm
287287
p11-kit-devel-0.24.1-1.cm2.x86_64.rpm

0 commit comments

Comments
 (0)