Skip to content

Commit

Permalink
Merge branch '3.9' into backport-f7bfac4-3.9
Browse files Browse the repository at this point in the history
  • Loading branch information
encukou authored Oct 9, 2024
2 parents 1dc3219 + be988e8 commit cbbf2b9
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 5 deletions.
4 changes: 3 additions & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,9 @@ jobs:
--with-pydebug \
--with-openssl="$(brew --prefix [email protected])" \
--with-tcltk-libs="$(pkg-config --libs tk)" \
--with-tcltk-includes="$(pkg-config --cflags tk)"
--with-tcltk-includes="$(pkg-config --cflags tk)" \
--with-dbmliborder=gdbm:ndbm
# (--with-dbmliborder needed for homebrew's gdbm 1.24: see gh-89452)
- name: Build CPython
run: make -j4
- name: Display build info
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Fix SSL tests CI for OpenSSL 3.1+
8 changes: 4 additions & 4 deletions Tools/ssl/multissltests.py
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down

0 comments on commit cbbf2b9

Please sign in to comment.