From 514a8be0485b02f8f18046c0c2f404596c3f91e1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Trojnara?= Date: Fri, 24 May 2024 16:49:01 +0200 Subject: [PATCH] Prefer SoftHSMv2 installed from source --- tests/ec-common.sh | 2 +- tests/ec-no-cert.sh | 2 +- tests/ec-no-pubkey.sh | 2 +- tests/rsa-common.sh | 3 +-- tests/rsa-no-pubkey.sh | 2 +- 5 files changed, 5 insertions(+), 6 deletions(-) diff --git a/tests/ec-common.sh b/tests/ec-common.sh index a53a4eef..7f1c3a66 100755 --- a/tests/ec-common.sh +++ b/tests/ec-common.sh @@ -33,7 +33,7 @@ echo "Output directory: ${outdir}" mkdir -p $outdir -for i in /usr/lib64/pkcs11 /usr/lib64/softhsm /usr/lib/x86_64-linux-gnu/softhsm /usr/local/lib/softhsm /opt/local/lib/softhsm /usr/lib/softhsm /usr/lib ;do +for i in /usr/local/lib/softhsm /opt/local/lib/softhsm /usr/lib64/pkcs11 /usr/lib64/softhsm /usr/lib/x86_64-linux-gnu/softhsm /usr/lib/softhsm /usr/lib; do if test -f "$i/libsofthsm2.so"; then MODULE="$i/libsofthsm2.so" break diff --git a/tests/ec-no-cert.sh b/tests/ec-no-cert.sh index 13ff6b17..0a9a3122 100755 --- a/tests/ec-no-cert.sh +++ b/tests/ec-no-cert.sh @@ -33,7 +33,7 @@ echo "Output directory: ${outdir}" mkdir -p $outdir -for i in /usr/lib64/pkcs11 /usr/lib64/softhsm /usr/lib/x86_64-linux-gnu/softhsm /usr/local/lib/softhsm /opt/local/lib/softhsm /usr/lib/softhsm /usr/lib ;do +for i in /usr/local/lib/softhsm /opt/local/lib/softhsm /usr/lib64/pkcs11 /usr/lib64/softhsm /usr/lib/x86_64-linux-gnu/softhsm /usr/lib/softhsm /usr/lib; do if test -f "$i/libsofthsm2.so"; then MODULE="$i/libsofthsm2.so" break diff --git a/tests/ec-no-pubkey.sh b/tests/ec-no-pubkey.sh index bf761a22..0838e1e2 100644 --- a/tests/ec-no-pubkey.sh +++ b/tests/ec-no-pubkey.sh @@ -33,7 +33,7 @@ echo "Output directory: ${outdir}" mkdir -p $outdir -for i in /usr/lib64/pkcs11 /usr/lib64/softhsm /usr/lib/x86_64-linux-gnu/softhsm /usr/local/lib/softhsm /opt/local/lib/softhsm /usr/lib/softhsm /usr/lib ;do +for i in /usr/local/lib/softhsm /opt/local/lib/softhsm /usr/lib64/pkcs11 /usr/lib64/softhsm /usr/lib/x86_64-linux-gnu/softhsm /usr/lib/softhsm /usr/lib; do if test -f "$i/libsofthsm2.so"; then MODULE="$i/libsofthsm2.so" break diff --git a/tests/rsa-common.sh b/tests/rsa-common.sh index e6e12cba..42477ee6 100755 --- a/tests/rsa-common.sh +++ b/tests/rsa-common.sh @@ -24,8 +24,7 @@ echo "Output directory: ${outdir}" mkdir -p $outdir # Set the module to be used -for i in /usr/lib64/pkcs11 /usr/lib64/softhsm /usr/lib/x86_64-linux-gnu/softhsm \ - /usr/local/lib/softhsm /opt/local/lib/softhsm /usr/lib/softhsm /usr/lib ;do +for i in /usr/local/lib/softhsm /opt/local/lib/softhsm /usr/lib64/pkcs11 /usr/lib64/softhsm /usr/lib/x86_64-linux-gnu/softhsm /usr/lib/softhsm /usr/lib; do if test -f "$i/libsofthsm2.so"; then MODULE="$i/libsofthsm2.so" break diff --git a/tests/rsa-no-pubkey.sh b/tests/rsa-no-pubkey.sh index ee283473..8e16084f 100644 --- a/tests/rsa-no-pubkey.sh +++ b/tests/rsa-no-pubkey.sh @@ -34,7 +34,7 @@ echo "Output directory: ${outdir}" mkdir -p $outdir -for i in /usr/lib64/pkcs11 /usr/lib64/softhsm /usr/lib/x86_64-linux-gnu/softhsm /usr/local/lib/softhsm /opt/local/lib/softhsm /usr/lib/softhsm /usr/lib ;do +for i in /usr/local/lib/softhsm /opt/local/lib/softhsm /usr/lib64/pkcs11 /usr/lib64/softhsm /usr/lib/x86_64-linux-gnu/softhsm /usr/lib/softhsm /usr/lib; do if test -f "$i/libsofthsm2.so"; then MODULE="$i/libsofthsm2.so" break