From 00a90057ebe3d10d44918bdf02e6553a48750b8c Mon Sep 17 00:00:00 2001 From: GuoCe Date: Tue, 10 Dec 2024 18:41:12 +0800 Subject: [PATCH] support TLS_SM4 (cherry picked from commit d49e65d4df926d66feace920e241d2e9f3f5015f) --- ...xpected_algs-list-to-include-TLS_SM4.patch | 24 +++++++++++++++++++ python3.spec | 10 +++++++- 2 files changed, 33 insertions(+), 1 deletion(-) create mode 100644 0001-expected_algs-list-to-include-TLS_SM4.patch diff --git a/0001-expected_algs-list-to-include-TLS_SM4.patch b/0001-expected_algs-list-to-include-TLS_SM4.patch new file mode 100644 index 0000000..c9eb546 --- /dev/null +++ b/0001-expected_algs-list-to-include-TLS_SM4.patch @@ -0,0 +1,24 @@ +From f1b6f59e1883ea5fdb543d2e0554a45d6b756caf Mon Sep 17 00:00:00 2001 +From: GuoCe +Date: Sat, 7 Dec 2024 16:15:49 +0800 +Subject: [PATCH] expected_algs list to include TLS_SM4 + +--- + Lib/test/test_ssl.py | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/Lib/test/test_ssl.py b/Lib/test/test_ssl.py +index 965c272..453624b 100644 +--- a/Lib/test/test_ssl.py ++++ b/Lib/test/test_ssl.py +@@ -4324,6 +4324,7 @@ class ThreadedTests(unittest.TestCase): + "AES256", "AES-256", + # TLS 1.3 ciphers are always enabled + "TLS_CHACHA20", "TLS_AES", ++ "TLS_SM4", + ] + + stats = server_params_test(client_context, server_context, +-- +2.33.0 + diff --git a/python3.spec b/python3.spec index 76e762a..bc7631c 100644 --- a/python3.spec +++ b/python3.spec @@ -3,7 +3,7 @@ Summary: Interpreter of the Python3 programming language URL: https://www.python.org/ Version: 3.11.6 -Release: 9 +Release: 10 License: Python-2.0 %global branchversion 3.11 @@ -106,6 +106,7 @@ Patch6014: backport-CVE-2023-27043.patch Patch9000: add-the-sm3-method-for-obtaining-the-salt-value.patch Patch9001: 0001-add-loongarch64-support-for-python.patch +Patch9002: 0001-expected_algs-list-to-include-TLS_SM4.patch Provides: python%{branchversion} = %{version}-%{release} Provides: python(abi) = %{branchversion} @@ -219,6 +220,7 @@ rm configure pyconfig.h.in %patch -P9000 -p1 %patch -P9001 -p1 +%patch -P9002 -p1 %build autoconf @@ -880,6 +882,12 @@ export BEP_GTDLIST="$BEP_GTDLIST_TMP" %{_mandir}/*/* %changelog +* Tue Dec 10 2024 GuoCe - 3.11.6-10 +- Type:update +- CVE:NA +- SUG:NA +- DESC:support TLS_SM4 + * Mon Nov 25 2024 xinsheng -3.11.6-9 - Type:CVE - CVE:CVE-2023-27043 -- Gitee