Skip to content

Commit fda2782

Browse files
authored
Merge branch '3.9' into backport-850189a-3.9
2 parents 993f70d + 681e0fa commit fda2782

File tree

2 files changed

+5
-4
lines changed

2 files changed

+5
-4
lines changed
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Fix SSL tests CI for OpenSSL 3.1+

Tools/ssl/multissltests.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -395,15 +395,15 @@ class BuildOpenSSL(AbstractBuilder):
395395
install_target = 'install_sw'
396396

397397
def _post_install(self):
398-
if self.version.startswith("3.0"):
399-
self._post_install_300()
398+
if self.version.startswith("3."):
399+
self._post_install_3xx()
400400

401401
def _build_src(self, config_args=()):
402-
if self.version.startswith("3.0"):
402+
if self.version.startswith("3."):
403403
config_args += ("enable-fips",)
404404
super()._build_src(config_args)
405405

406-
def _post_install_300(self):
406+
def _post_install_3xx(self):
407407
# create ssl/ subdir with example configs
408408
# Install FIPS module
409409
self._subprocess_call(

0 commit comments

Comments
 (0)