From: Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com>
Date: Wed, 9 Oct 2024 13:41:22 +0000 (+0200)
Subject: [3.9] gh-100454: Fix running SSL tests with OpenSSL 3.1+ (GH-100456) (GH-125186)
X-Git-Tag: v3.9.21~12
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=681e0fa658aa4670154585bfb779f4f654775363;p=thirdparty%2FPython%2Fcpython.git

[3.9] gh-100454: Fix running SSL tests with OpenSSL 3.1+ (GH-100456) (GH-125186)

This fixes Ubuntu pipeline with OpenSSL 3.1+

(cherry picked from commit 333c7dccd87c637d0b15cf81f9bbec28e39664fd)

Co-authored-by: Dimitri John Ledkov <19779+xnox@users.noreply.github.com>
Co-authored-by: Illia Volochii <illia.volochii@gmail.com>
---

diff --git a/Misc/NEWS.d/next/Tests/2022-12-23-13-29-55.gh-issue-100454.3no0cW.rst b/Misc/NEWS.d/next/Tests/2022-12-23-13-29-55.gh-issue-100454.3no0cW.rst
new file mode 100644
index 000000000000..3d5fdc8aba32
--- /dev/null
+++ b/Misc/NEWS.d/next/Tests/2022-12-23-13-29-55.gh-issue-100454.3no0cW.rst
@@ -0,0 +1 @@
+Fix SSL tests CI for OpenSSL 3.1+
diff --git a/Tools/ssl/multissltests.py b/Tools/ssl/multissltests.py
index 1a20e3f19a13..d978e282c73e 100755
--- a/Tools/ssl/multissltests.py
+++ b/Tools/ssl/multissltests.py
@@ -395,15 +395,15 @@ class BuildOpenSSL(AbstractBuilder):
     install_target = 'install_sw'
 
     def _post_install(self):
-        if self.version.startswith("3.0"):
-            self._post_install_300()
+        if self.version.startswith("3."):
+            self._post_install_3xx()
 
     def _build_src(self, config_args=()):
-        if self.version.startswith("3.0"):
+        if self.version.startswith("3."):
             config_args += ("enable-fips",)
         super()._build_src(config_args)
 
-    def _post_install_300(self):
+    def _post_install_3xx(self):
         # create ssl/ subdir with example configs
         # Install FIPS module
         self._subprocess_call(