diff --git a/Makefile b/Makefile index cbe0d8f3..a8fc7e95 100644 --- a/Makefile +++ b/Makefile @@ -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-; \ diff --git a/contrib/debian/rules b/contrib/debian/rules index 42329aec..8458ac6a 100755 --- a/contrib/debian/rules +++ b/contrib/debian/rules @@ -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; \