Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitaa96992

Browse files
CBL-Mariner-Bottobiasb-msPawelWMSjslobodzian
authored
[AUTO-CHERRYPICK] [AUTOPATCHER-CORE] Upgrade openssl to 3.3.5 CVEs - branch 3.0-dev (#14891)
Co-authored-by: Tobias Brick <tobiasb@microsoft.com>Co-authored-by: Pawel Winogrodzki <pawelwi@microsoft.com>Co-authored-by: jslobodzian <joslobo@microsoft.com>
1 parentfbb2526 commitaa96992

File tree

9 files changed

+40
-74
lines changed

9 files changed

+40
-74
lines changed

‎SPECS/openssl/0008-Add-FIPS_mode-compatibility-macro.patch‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
From8e29a10b39a649d751870eb1fd1b8c388e66acc3 Mon Sep 17 00:00:00 2001
1+
Fromf803c320433fb1663a818a5ce97f39c3cd46fdd9 Mon Sep 17 00:00:00 2001
22
From: rpm-build <rpm-build>
33
Date: Mon, 31 Jul 2023 09:41:27 +0200
4-
Subject: [PATCH 08/35] 0008-Add-FIPS_mode-compatibility-macro.patch
4+
Subject: [PATCH] 0008-Add-FIPS_mode-compatibility-macro.patch
55

66
Patch-name: 0008-Add-FIPS_mode-compatibility-macro.patch
77
Patch-id: 8
@@ -16,7 +16,7 @@ From-dist-git-commit: 9409bc7044cf4b5773639cce20f51399888c45fd
1616

1717
diff --git a/include/openssl/fips.h b/include/openssl/fips.h
1818
new file mode 100644
19-
index0000000000..4162cbf88e
19+
index0000000..4162cbf
2020
--- /dev/null
2121
+++ b/include/openssl/fips.h
2222
@@ -0,0 +1,26 @@
@@ -47,10 +47,10 @@ index 0000000000..4162cbf88e
4747
+# endif
4848
+#endif
4949
diff --git a/test/property_test.c b/test/property_test.c
50-
index45b1db3e85..8894c1c1cb 100644
50+
indexe62ff24..37489e4 100644
5151
--- a/test/property_test.c
5252
+++ b/test/property_test.c
53-
@@ -677,6 +677,19 @@ static inttest_property_list_to_string(int i)
53+
@@ -703,6 +703,19 @@ static inttest_property_list_to_string_bounds(void)
5454
return ret;
5555
}
5656

@@ -70,14 +70,14 @@ index 45b1db3e85..8894c1c1cb 100644
7070
int setup_tests(void)
7171
{
7272
ADD_TEST(test_property_string);
73-
@@ -690,6 +703,7 @@ int setup_tests(void)
73+
@@ -716,6 +729,7 @@ int setup_tests(void)
7474
ADD_TEST(test_property);
7575
ADD_TEST(test_query_cache_stochastic);
7676
ADD_TEST(test_fips_mode);
7777
+ ADD_TEST(test_downstream_FIPS_mode);
7878
ADD_ALL_TESTS(test_property_list_to_string, OSSL_NELEM(to_string_tests));
79+
ADD_TEST(test_property_list_to_string_bounds);
7980
return 1;
80-
}
8181
--
82-
2.41.0
82+
2.45.4
8383

‎SPECS/openssl/Keep-the-provided-peer-EVP_PKEY-in-the-EVP_PKEY_CTX-too.patch‎

Lines changed: 0 additions & 34 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.3.tar.gz":"712590fd20aaa60ec75d778fe5b810d6b829ca7fb1e530577917a131f9105539"
8+
"openssl-3.3.5.tar.gz":"9d62c00a5a6903740c8703f0e006257f429d565d3b91ac1a9bd4a4c700002e01"
99
}
1010
}

‎SPECS/openssl/openssl.spec‎

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

99
Summary: Utilities from the general purpose cryptography library with TLS implementation
1010
Name: openssl
11-
Version: 3.3.3
12-
Release:3%{?dist}
11+
Version: 3.3.5
12+
Release:1%{?dist}
1313
Vendor: Microsoft Corporation
1414
Distribution: Azure Linux
1515
Source: https://github.com/openssl/openssl/releases/download/openssl-%{version}/openssl-%{version}.tar.gz
@@ -29,7 +29,7 @@ Patch3: 0003-Do-not-install-html-docs.patch
2929
Patch5: 0005-apps-ca-fix-md-option-help-text.patch
3030
# # Disable signature verification with totally unsafe hash algorithms
3131
Patch6: 0006-Disable-signature-verification-with-totally-unsafe-h.patch
32-
##Add FIPS_mode() compatibility macro
32+
# Add FIPS_mode() compatibility macro
3333
Patch8: 0008-Add-FIPS_mode-compatibility-macro.patch
3434
# # Add check to see if fips flag is enabled in kernel
3535
Patch9: 0009-Add-Kernel-FIPS-mode-flag-support.patch
@@ -62,10 +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-
# Fix crashes in openssl speed with providers that don't refcount keys.
66-
# Upstream: https://github.com/openssl/openssl/pull/26976 has been merged into 3.3, so if we
67-
# upgrade to 3.3.4 when it comes out, we can remove this patch.
68-
Patch81: Keep-the-provided-peer-EVP_PKEY-in-the-EVP_PKEY_CTX-too.patch
6965
# The Symcrypt provider, which is our default, doesn't support some of the
7066
# algorithms that are used in the speed tests. This patch skips those tests.
7167
# If SymCrypt adds support, we should change and eventually remove this patch.
@@ -94,6 +90,7 @@ BuildRequires: sed
9490
BuildRequires: perl(Math::BigInt)
9591
BuildRequires: perl(Test::Harness)
9692
BuildRequires: perl(Test::More)
93+
BuildRequires: perl(Time::Piece)
9794
%endif
9895

9996
Requires: %{name}-libs%{?_isa}= %{version}-%{release}
@@ -365,6 +362,9 @@ install -m644 %{SOURCE9} \
365362
%ldconfig_scriptlets libs
366363

367364
%changelog
365+
*Thu Oct 02 2025CBL-Mariner Servicing Account<cblmargh@microsoft.com> -3.3.5-1
366+
-Auto-upgrade to 3.3.5 for CVE-2025-9230 and CVE-2025-9232
367+
368368
*Mon Aug 25 2025Andrew Phelps<anphel@microsoft.com> -3.3.3-3
369369
-Bump to rebuild with build-id fix from toolchain gcc
370370

‎cgmanifest.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15593,8 +15593,8 @@
1559315593
"type": "other",
1559415594
"other": {
1559515595
"name": "openssl",
15596-
"version": "3.3.3",
15597-
"downloadUrl": "https://github.com/openssl/openssl/releases/download/openssl-3.3.3/openssl-3.3.3.tar.gz"
15596+
"version": "3.3.5",
15597+
"downloadUrl": "https://github.com/openssl/openssl/releases/download/openssl-3.3.5/openssl-3.3.5.tar.gz"
1559815598
}
1559915599
}
1560015600
},

‎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.3-3.azl3.aarch64.rpm
174-
openssl-devel-3.3.3-3.azl3.aarch64.rpm
175-
openssl-libs-3.3.3-3.azl3.aarch64.rpm
176-
openssl-perl-3.3.3-3.azl3.aarch64.rpm
177-
openssl-static-3.3.3-3.azl3.aarch64.rpm
173+
openssl-3.3.5-1.azl3.aarch64.rpm
174+
openssl-devel-3.3.5-1.azl3.aarch64.rpm
175+
openssl-libs-3.3.5-1.azl3.aarch64.rpm
176+
openssl-perl-3.3.5-1.azl3.aarch64.rpm
177+
openssl-static-3.3.5-1.azl3.aarch64.rpm
178178
libcap-2.69-8.azl3.aarch64.rpm
179179
libcap-devel-2.69-8.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.3-3.azl3.x86_64.rpm
174-
openssl-devel-3.3.3-3.azl3.x86_64.rpm
175-
openssl-libs-3.3.3-3.azl3.x86_64.rpm
176-
openssl-perl-3.3.3-3.azl3.x86_64.rpm
177-
openssl-static-3.3.3-3.azl3.x86_64.rpm
173+
openssl-3.3.5-1.azl3.x86_64.rpm
174+
openssl-devel-3.3.5-1.azl3.x86_64.rpm
175+
openssl-libs-3.3.5-1.azl3.x86_64.rpm
176+
openssl-perl-3.3.5-1.azl3.x86_64.rpm
177+
openssl-static-3.3.5-1.azl3.x86_64.rpm
178178
libcap-2.69-8.azl3.x86_64.rpm
179179
libcap-devel-2.69-8.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
@@ -287,12 +287,12 @@ npth-debuginfo-1.6-4.azl3.aarch64.rpm
287287
npth-devel-1.6-4.azl3.aarch64.rpm
288288
ntsysv-1.25-1.azl3.aarch64.rpm
289289
ocaml-srpm-macros-9-4.azl3.noarch.rpm
290-
openssl-3.3.3-3.azl3.aarch64.rpm
291-
openssl-debuginfo-3.3.3-3.azl3.aarch64.rpm
292-
openssl-devel-3.3.3-3.azl3.aarch64.rpm
293-
openssl-libs-3.3.3-3.azl3.aarch64.rpm
294-
openssl-perl-3.3.3-3.azl3.aarch64.rpm
295-
openssl-static-3.3.3-3.azl3.aarch64.rpm
290+
openssl-3.3.5-1.azl3.aarch64.rpm
291+
openssl-debuginfo-3.3.5-1.azl3.aarch64.rpm
292+
openssl-devel-3.3.5-1.azl3.aarch64.rpm
293+
openssl-libs-3.3.5-1.azl3.aarch64.rpm
294+
openssl-perl-3.3.5-1.azl3.aarch64.rpm
295+
openssl-static-3.3.5-1.azl3.aarch64.rpm
296296
p11-kit-0.25.0-1.azl3.aarch64.rpm
297297
p11-kit-debuginfo-0.25.0-1.azl3.aarch64.rpm
298298
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
@@ -295,12 +295,12 @@ npth-debuginfo-1.6-4.azl3.x86_64.rpm
295295
npth-devel-1.6-4.azl3.x86_64.rpm
296296
ntsysv-1.25-1.azl3.x86_64.rpm
297297
ocaml-srpm-macros-9-4.azl3.noarch.rpm
298-
openssl-3.3.3-3.azl3.x86_64.rpm
299-
openssl-debuginfo-3.3.3-3.azl3.x86_64.rpm
300-
openssl-devel-3.3.3-3.azl3.x86_64.rpm
301-
openssl-libs-3.3.3-3.azl3.x86_64.rpm
302-
openssl-perl-3.3.3-3.azl3.x86_64.rpm
303-
openssl-static-3.3.3-3.azl3.x86_64.rpm
298+
openssl-3.3.5-1.azl3.x86_64.rpm
299+
openssl-debuginfo-3.3.5-1.azl3.x86_64.rpm
300+
openssl-devel-3.3.5-1.azl3.x86_64.rpm
301+
openssl-libs-3.3.5-1.azl3.x86_64.rpm
302+
openssl-perl-3.3.5-1.azl3.x86_64.rpm
303+
openssl-static-3.3.5-1.azl3.x86_64.rpm
304304
p11-kit-0.25.0-1.azl3.x86_64.rpm
305305
p11-kit-debuginfo-0.25.0-1.azl3.x86_64.rpm
306306
p11-kit-devel-0.25.0-1.azl3.x86_64.rpm

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp