shinys000114/libssh
1
0
Fork 0
mirror of https://git.libssh.org/projects/libssh.git synced 2026-02-09 18:04:25 +09:00
Code Issues Packages Projects Releases Wiki Activity

Fix libsofthsm.so path detection

Browse Source 
libsofthsm detection is broken in i686 architecture. The approach is to export
the path found by cmake to `tests_config.h` and the script
setup-softhsm-tokens.sh gets that value through cli parameters.

Signed-off-by: Norbert Pocs <npocs@redhat.com>
Reviewed-by: Jakub Jelen <jjelen@redhat.com>
(cherry picked from commit 50713d8ab1)
This commit is contained in:
Norbert Pocs
2022-10-04 16:54:24 +02:00
committed by Andreas Schneider
parent 13363975d8
commit 8c17a79797
4 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
tests/pkcs11/setup-softhsm-tokens.sh
View File

@@ -6,7 +6,8 @@ TESTDIR=$1
PRIVKEY=$2
OBJNAME=$3
LOADPUBLIC=$4
shift 4
LIBSOFTHSM_PATH=$5
shift 5
PUBKEY="$PRIVKEY.pub"
@@ -42,7 +43,7 @@ if [ $ret -ne 0 ]; then
fi
#load private key
cmd='p11tool --provider /usr/lib64/pkcs11/libsofthsm2.so --write --load-privkey "$PRIVKEY" --label "$OBJNAME" --login --set-pin=1234 "pkcs11:token="$OBJNAME""'
cmd='p11tool --provider $LIBSOFTHSM_PATH --write --load-privkey "$PRIVKEY" --label "$OBJNAME" --login --set-pin=1234 "pkcs11:token="$OBJNAME""'
eval echo "$cmd"
out=$(eval $cmd)
ret=$?
@@ -58,7 +59,7 @@ ls -l $TESTDIR
if [ $LOADPUBLIC -ne 0 ]; then
#load public key
cmd='p11tool --provider /usr/lib64/pkcs11/libsofthsm2.so --write --load-pubkey "$PUBKEY" --label "$OBJNAME" --login --set-pin=1234 "pkcs11:token="$OBJNAME""'
cmd='p11tool --provider $LIBSOFTHSM_PATH --write --load-pubkey "$PUBKEY" --label "$OBJNAME" --login --set-pin=1234 "pkcs11:token="$OBJNAME""'
eval echo "$cmd"
out=$(eval $cmd)
ret=$?