Skip to content

Commit

Permalink
Update build to work with OpenSSL 3.2 (#642)
Browse files Browse the repository at this point in the history
From recent builds, it appears that RHEL 9 has upgraded from OpenSSL 3.0 to 3.2, which breaks our builds. I found two places where we filter on the OpenSSL version.

In Makefile, I removed the filter because we no longer support OpenSSL 1.0, which is why the case statement was added. All versions of OpenSSL we support should behave the same, so there's no need to filter on the version.

In contrib/debian/rules, I relaxed the filter to handle any 3.x version of OpenSSL.
  • Loading branch information
damonbarry authored Nov 13, 2024
1 parent 005a4ea commit ae5f3af
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 5 deletions.
5 changes: 1 addition & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -355,10 +355,7 @@ rpm:
# Engine needs to be installed to what openssl considers the enginesdir, which we can get from
# openssl 1.1 and 3.0 with `openssl version -e`.
command -v openssl # Assert that openssl exists
case "$$(openssl version)" in \
'OpenSSL 1.1.'* | 'OpenSSL 3.0.'*) OPENSSL_ENGINE_FILENAME="$$(openssl version -e | sed 's/^ENGINESDIR: "\(.*\)"$$/\1/')/aziot_keys.so" ;; \
*) echo "Unknown openssl version [$$(openssl version)]"; exit 1 ;; \
esac; \
OPENSSL_ENGINE_FILENAME="$$(openssl version -e | sed 's/^ENGINESDIR: "\(.*\)"$$/\1/')/aziot_keys.so"; \
case "$$PACKAGE_DIST" in \
'el7') \
DEVTOOLSET=devtoolset-9-; \
Expand Down
2 changes: 1 addition & 1 deletion contrib/debian/rules
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ override_dh_auto_install:
'*') exit 1;; \
esac; \
case "$$(openssl version)" in \
'OpenSSL 3.0.'*) engines_dir="/usr/lib/$$arch_libdir/engines-3";; \
'OpenSSL 3.'*) engines_dir="/usr/lib/$$arch_libdir/engines-3";; \
'OpenSSL 1.1.'*) engines_dir="/usr/lib/$$arch_libdir/engines-1.1";; \
'*') exit 1;; \
esac; \
Expand Down

0 comments on commit ae5f3af

Please sign in to comment.