Skip to content

Commit e728ae0

Browse files
authored
upgrade openssl to 3.3.2 (#10494)
Upgrades openssl to 3.3.2. This contains bug fixes and addresses some CVEs.
1 parent c4b0a79 commit e728ae0

10 files changed

Lines changed: 36 additions & 141 deletions

File tree

SPECS/openssl/CVE-2024-5535.patch

Lines changed: 0 additions & 106 deletions
This file was deleted.

SPECS/openssl/openssl.signatures.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,6 @@
55
"configuration-prefix.h": "11aba0dcfab381269e7e6ba1fdde1e4e8dfe51e39d8c7a2918f3b28a32cb98fd",
66
"configuration-switch.h": "400439d7e8c551e7d5de8bfc648dcc0ddf6f4a7552750af4813449f68941b928",
77
"genpatches": "9da7f988d4378adf499b1322e79f29e94c889c4bf10cd6e79e6991b673de2463",
8-
"openssl-3.3.0.tar.gz": "53e66b043322a606abf0087e7699a0e033a37fa13feb9742df35c3a33b18fb02"
8+
"openssl-3.3.2.tar.gz": "2e8a40b01979afe8be0bbfb3de5dc1c6709fedb46d6c89c10da114ab5fc3d281"
99
}
1010
}

SPECS/openssl/openssl.spec

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@
88

99
Summary: Utilities from the general purpose cryptography library with TLS implementation
1010
Name: openssl
11-
Version: 3.3.0
12-
Release: 2%{?dist}
11+
Version: 3.3.2
12+
Release: 1%{?dist}
1313
Vendor: Microsoft Corporation
1414
Distribution: Azure Linux
15-
Source: https://www.openssl.org/source/openssl-%{version}.tar.gz
15+
Source: https://github.com/openssl/openssl/releases/download/openssl-%{version}/openssl-%{version}.tar.gz
1616
Source2: Makefile.certificate
1717
Source3: genpatches
1818
Source9: configuration-switch.h
@@ -62,8 +62,6 @@ Patch52: 0052-Allow-SHA1-in-seclevel-1-if-rh-allow-sha1-signatures.patch
6262
# # See notes in the patch for details, but this patch will not be needed if
6363
# # the openssl issue https://github.com/openssl/openssl/issues/7048 is ever implemented and released.
6464
Patch80: 0001-Replacing-deprecated-functions-with-NULL-or-highest.patch
65-
# Remove if we upgrade to 3.3.2 to or later. https://www.openssl.org/news/secadv/20240627.txt
66-
Patch81: CVE-2024-5535.patch
6765

6866
License: Apache-2.0
6967
URL: http://www.openssl.org/
@@ -360,6 +358,9 @@ install -m644 %{SOURCE9} \
360358
%ldconfig_scriptlets libs
361359

362360
%changelog
361+
* Thu Sep 19 2024 Tobias Brick <tobiasb@microsoft.com> - 3.3.2-1
362+
- Upgrade to 3.3.2
363+
363364
* Fri Jul 12 2024 Suresh Thelkar <sthelkar@microsoft.com> - 3.3.0-2
364365
- Patch CVE-2023-5535
365366

cgmanifest.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15203,8 +15203,8 @@
1520315203
"type": "other",
1520415204
"other": {
1520515205
"name": "openssl",
15206-
"version": "3.3.0",
15207-
"downloadUrl": "https://www.openssl.org/source/openssl-3.3.0.tar.gz"
15206+
"version": "3.3.2",
15207+
"downloadUrl": "https://github.com/openssl/openssl/releases/download/openssl-3.3.2/openssl-3.3.2.tar.gz"
1520815208
}
1520915209
}
1521015210
},

toolkit/resources/manifests/package/pkggen_core_aarch64.txt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -170,11 +170,11 @@ gtk-doc-1.33.2-1.azl3.noarch.rpm
170170
autoconf-2.72-2.azl3.noarch.rpm
171171
automake-1.16.5-2.azl3.noarch.rpm
172172
ocaml-srpm-macros-9-4.azl3.noarch.rpm
173-
openssl-3.3.0-2.azl3.aarch64.rpm
174-
openssl-devel-3.3.0-2.azl3.aarch64.rpm
175-
openssl-libs-3.3.0-2.azl3.aarch64.rpm
176-
openssl-perl-3.3.0-2.azl3.aarch64.rpm
177-
openssl-static-3.3.0-2.azl3.aarch64.rpm
173+
openssl-3.3.2-1.azl3.aarch64.rpm
174+
openssl-devel-3.3.2-1.azl3.aarch64.rpm
175+
openssl-libs-3.3.2-1.azl3.aarch64.rpm
176+
openssl-perl-3.3.2-1.azl3.aarch64.rpm
177+
openssl-static-3.3.2-1.azl3.aarch64.rpm
178178
libcap-2.69-1.azl3.aarch64.rpm
179179
libcap-devel-2.69-1.azl3.aarch64.rpm
180180
debugedit-5.0-2.azl3.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
@@ -170,11 +170,11 @@ gtk-doc-1.33.2-1.azl3.noarch.rpm
170170
autoconf-2.72-2.azl3.noarch.rpm
171171
automake-1.16.5-2.azl3.noarch.rpm
172172
ocaml-srpm-macros-9-4.azl3.noarch.rpm
173-
openssl-3.3.0-2.azl3.x86_64.rpm
174-
openssl-devel-3.3.0-2.azl3.x86_64.rpm
175-
openssl-libs-3.3.0-2.azl3.x86_64.rpm
176-
openssl-perl-3.3.0-2.azl3.x86_64.rpm
177-
openssl-static-3.3.0-2.azl3.x86_64.rpm
173+
openssl-3.3.2-1.azl3.x86_64.rpm
174+
openssl-devel-3.3.2-1.azl3.x86_64.rpm
175+
openssl-libs-3.3.2-1.azl3.x86_64.rpm
176+
openssl-perl-3.3.2-1.azl3.x86_64.rpm
177+
openssl-static-3.3.2-1.azl3.x86_64.rpm
178178
libcap-2.69-1.azl3.x86_64.rpm
179179
libcap-devel-2.69-1.azl3.x86_64.rpm
180180
debugedit-5.0-2.azl3.x86_64.rpm

toolkit/resources/manifests/package/toolchain_aarch64.txt

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -285,12 +285,12 @@ npth-debuginfo-1.6-4.azl3.aarch64.rpm
285285
npth-devel-1.6-4.azl3.aarch64.rpm
286286
ntsysv-1.25-1.azl3.aarch64.rpm
287287
ocaml-srpm-macros-9-4.azl3.noarch.rpm
288-
openssl-3.3.0-2.azl3.aarch64.rpm
289-
openssl-debuginfo-3.3.0-2.azl3.aarch64.rpm
290-
openssl-devel-3.3.0-2.azl3.aarch64.rpm
291-
openssl-libs-3.3.0-2.azl3.aarch64.rpm
292-
openssl-perl-3.3.0-2.azl3.aarch64.rpm
293-
openssl-static-3.3.0-2.azl3.aarch64.rpm
288+
openssl-3.3.2-1.azl3.aarch64.rpm
289+
openssl-debuginfo-3.3.2-1.azl3.aarch64.rpm
290+
openssl-devel-3.3.2-1.azl3.aarch64.rpm
291+
openssl-libs-3.3.2-1.azl3.aarch64.rpm
292+
openssl-perl-3.3.2-1.azl3.aarch64.rpm
293+
openssl-static-3.3.2-1.azl3.aarch64.rpm
294294
p11-kit-0.25.0-1.azl3.aarch64.rpm
295295
p11-kit-debuginfo-0.25.0-1.azl3.aarch64.rpm
296296
p11-kit-devel-0.25.0-1.azl3.aarch64.rpm

toolkit/resources/manifests/package/toolchain_x86_64.txt

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -291,12 +291,12 @@ npth-debuginfo-1.6-4.azl3.x86_64.rpm
291291
npth-devel-1.6-4.azl3.x86_64.rpm
292292
ntsysv-1.25-1.azl3.x86_64.rpm
293293
ocaml-srpm-macros-9-4.azl3.noarch.rpm
294-
openssl-3.3.0-2.azl3.x86_64.rpm
295-
openssl-debuginfo-3.3.0-2.azl3.x86_64.rpm
296-
openssl-devel-3.3.0-2.azl3.x86_64.rpm
297-
openssl-libs-3.3.0-2.azl3.x86_64.rpm
298-
openssl-perl-3.3.0-2.azl3.x86_64.rpm
299-
openssl-static-3.3.0-2.azl3.x86_64.rpm
294+
openssl-3.3.2-1.azl3.x86_64.rpm
295+
openssl-debuginfo-3.3.2-1.azl3.x86_64.rpm
296+
openssl-devel-3.3.2-1.azl3.x86_64.rpm
297+
openssl-libs-3.3.2-1.azl3.x86_64.rpm
298+
openssl-perl-3.3.2-1.azl3.x86_64.rpm
299+
openssl-static-3.3.2-1.azl3.x86_64.rpm
300300
p11-kit-0.25.0-1.azl3.x86_64.rpm
301301
p11-kit-debuginfo-0.25.0-1.azl3.x86_64.rpm
302302
p11-kit-devel-0.25.0-1.azl3.x86_64.rpm

toolkit/scripts/toolchain/container/toolchain-sha256sums

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ dd16fb1d67bfab79a72f5e8390735c49e3e8e70b4945a15ab1f81ddb78658fb3 make-4.4.1.tar
4141
ab642492f5cf882b74aa0cb730cd410a81edcdbec895183ce930e706c1c759b8 mpc-1.3.1.tar.gz
4242
277807353a6726978996945af13e52829e3abd7a9a5b7fb2793894e18f1fcbb2 mpfr-4.2.1.tar.xz
4343
6931283d9ac87c5073f30b6290c4c75f21632bb4fc3603ac8100812bed248159 ncurses-6.4.tar.gz
44-
53e66b043322a606abf0087e7699a0e033a37fa13feb9742df35c3a33b18fb02 openssl-3.3.0.tar.gz
44+
2e8a40b01979afe8be0bbfb3de5dc1c6709fedb46d6c89c10da114ab5fc3d281 openssl-3.3.2.tar.gz
4545
ac610bda97abe0d9f6b7c963255a11dcb196c25e337c61f94e4778d632f1d8fd patch-2.7.6.tar.xz
4646
eca551caec3bc549a4e590c0015003790bdd1a604ffe19cc78ee631d51f7072e perl-5.38.0.tar.xz
4747
ea5a25ef8f251eb5377ec0e21c75fb61894433cfbdbf0b2559ba33e4c2664401 pkgconf-2.0.2.tar.xz

toolkit/scripts/toolchain/container/toolchain_build_in_chroot.sh

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -571,9 +571,9 @@ popd
571571
rm -rf automake-1.16.5
572572
touch /logs/status_automake_complete
573573

574-
echo OpenSSL-3.3.0
575-
tar xf openssl-3.3.0.tar.gz
576-
pushd openssl-3.3.0
574+
echo OpenSSL-3.3.2
575+
tar xf openssl-3.3.2.tar.gz
576+
pushd openssl-3.3.2
577577
sslarch=
578578
./config --prefix=/usr \
579579
--openssldir=/etc/pki/tls \
@@ -591,7 +591,7 @@ make all -j$(nproc)
591591
sed -i '/INSTALL_LIBS/s/libcrypto.a libssl.a//' Makefile
592592
make MANSUFFIX=ssl install
593593
popd
594-
rm -rf openssl-3.3.0
594+
rm -rf openssl-3.3.2
595595
touch /logs/status_openssl_complete
596596

597597
echo Elfutils-0.189

0 commit comments

Comments
 (0)