Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update build to work with OpenSSL 3.2 #642

Merged
merged 2 commits into from
Nov 13, 2024
Merged

Update build to work with OpenSSL 3.2 #642

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a1364bc
Update build to work with OpenSSL 3.2
damonbarry Nov 13, 2024
2d3d1dc
Add semicolon to terminate variable assignment
damonbarry Nov 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 1 addition & 4 deletions Makefile
View file
Open in desktop
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
View file
Open in desktop
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
Loading