diff --git a/test/integration/p11-tool.sh.nosetup b/test/integration/p11-tool.sh.nosetup index 586a9330..43e03f40 100755 --- a/test/integration/p11-tool.sh.nosetup +++ b/test/integration/p11-tool.sh.nosetup @@ -222,7 +222,7 @@ auth_myrsakey=$(echo "$yaml_myrsakey" | grep "object-auth" | cut -d' ' -f2-) setup_asan -openssl dgst -provider tpm2 -provider base \ +openssl dgst -provider tpm2 -provider default \ -sha256 -sigopt rsa_padding_mode:pss -sigopt rsa_pss_saltlen:-1 \ -sign "$TPM2_PKCS11_STORE/myrsakey.pem" -out ${tempdir}/sig -passin "pass:$auth_myrsakey" ${tempdir}/data @@ -252,7 +252,7 @@ auth_myecckey=$(echo "$yaml_myecckey" | grep "object-auth" | cut -d' ' -f2-) setup_asan -openssl dgst -provider tpm2 -provider base \ +openssl dgst -provider tpm2 -provider default \ -sha1 -sign "$TPM2_PKCS11_STORE/myecckey.pem" -out ${tempdir}/sig -passin "pass:$auth_myecckey" ${tempdir}/data openssl dgst -sha1 -verify ${tempdir}/eccpubkey.pem -signature ${tempdir}/sig ${tempdir}/data diff --git a/test/integration/scripts/helpers.sh b/test/integration/scripts/helpers.sh index f19379c9..fe6def08 100644 --- a/test/integration/scripts/helpers.sh +++ b/test/integration/scripts/helpers.sh @@ -84,7 +84,7 @@ check_openssl_version() { # do this in an if statement so it can fail and not cause # set -e (execfail) to exit the script - if pkg-config --exists 'libcrypto < 3'; then + if pkg-config --max-version 3 --exists 'libcrypto'; then OSSL3_DETECTED=0 else OSSL3_DETECTED=1