|
 |
5fd609 |
diff --git a/tests/pkcs11/setup-softhsm-tokens.sh b/tests/pkcs11/setup-softhsm-tokens.sh
|
|
|
5fd609 |
index 532c86a7..9050cea6 100755
|
|
|
5fd609 |
--- a/tests/pkcs11/setup-softhsm-tokens.sh
|
|
|
5fd609 |
+++ b/tests/pkcs11/setup-softhsm-tokens.sh
|
|
|
5fd609 |
@@ -17,10 +17,10 @@ echo "OBJNAME: $OBJNAME"
|
|
|
5fd609 |
echo "LOADPUBLIC: $LOADPUBLIC"
|
|
|
5fd609 |
|
|
|
5fd609 |
# Create temporary directory for tokens
|
|
|
5fd609 |
-install -d -m 0755 $TESTDIR/db
|
|
|
5fd609 |
+install -d -m 0755 "$TESTDIR/db"
|
|
|
5fd609 |
|
|
|
5fd609 |
# Create SoftHSM configuration file
|
|
|
5fd609 |
-cat >$TESTDIR/softhsm.conf <
|
|
|
5fd609 |
+cat >"$TESTDIR/softhsm.conf" <
|
|
|
5fd609 |
directories.tokendir = $TESTDIR/db
|
|
|
5fd609 |
objectstore.backend = file
|
|
|
5fd609 |
log.level = DEBUG
|
|
|
5fd609 |
@@ -28,12 +28,12 @@ EOF
|
|
|
5fd609 |
|
|
|
5fd609 |
export SOFTHSM2_CONF=$TESTDIR/softhsm.conf
|
|
|
5fd609 |
|
|
|
5fd609 |
-cat $TESTDIR/softhsm.conf
|
|
|
5fd609 |
+cat "$TESTDIR/softhsm.conf"
|
|
|
5fd609 |
|
|
|
5fd609 |
#init
|
|
|
5fd609 |
-cmd='softhsm2-util --init-token --label "$OBJNAME" --free --pin 1234 --so-pin 1234'
|
|
|
5fd609 |
+cmd="softhsm2-util --init-token --label $OBJNAME --free --pin 1234 --so-pin 1234"
|
|
|
5fd609 |
eval echo "$cmd"
|
|
|
5fd609 |
-out=$(eval $cmd)
|
|
|
5fd609 |
+out=$(eval "$cmd")
|
|
|
5fd609 |
ret=$?
|
|
|
5fd609 |
if [ $ret -ne 0 ]; then
|
|
|
5fd609 |
echo "Init token failed"
|
|
|
5fd609 |
@@ -41,10 +41,29 @@ if [ $ret -ne 0 ]; then
|
|
|
5fd609 |
exit 1
|
|
|
5fd609 |
fi
|
|
|
5fd609 |
|
|
|
5fd609 |
+find_library_path() {
|
|
|
5fd609 |
+ echo "$@"
|
|
|
5fd609 |
+ for _lib in "$@" ; do
|
|
|
5fd609 |
+ if test -f "$_lib" ; then
|
|
|
5fd609 |
+ LIBSOFTHSM_PATH="$_lib"
|
|
|
5fd609 |
+ echo "Using libsofthsm path: $LIBSOFTHSM_PATH"
|
|
|
5fd609 |
+ return
|
|
|
5fd609 |
+ fi
|
|
|
5fd609 |
+ done
|
|
|
5fd609 |
+ echo "libsofthsm2.so not found"
|
|
|
5fd609 |
+ exit 1
|
|
|
5fd609 |
+}
|
|
|
5fd609 |
+
|
|
|
5fd609 |
+find_library_path \
|
|
|
5fd609 |
+ /usr/lib64/libsofthsm2.so \
|
|
|
5fd609 |
+ /usr/lib/libsofthsm2.so \
|
|
|
5fd609 |
+ /usr/local/lib/softhsm/libsofthsm2.so \
|
|
|
5fd609 |
+ /usr/lib/x86_64-linux-gnu/softhsm/libsofthsm2.so
|
|
|
5fd609 |
+
|
|
|
5fd609 |
#load private key
|
|
|
5fd609 |
-cmd='p11tool --provider /usr/lib64/pkcs11/libsofthsm2.so --write --load-privkey "$PRIVKEY" --label "$OBJNAME" --login --set-pin=1234 "pkcs11:token="$OBJNAME""'
|
|
|
5fd609 |
+cmd="p11tool --provider $LIBSOFTHSM_PATH --write --load-privkey $PRIVKEY --label $OBJNAME --login --set-pin=1234 \"pkcs11:token=$OBJNAME\""
|
|
|
5fd609 |
eval echo "$cmd"
|
|
|
5fd609 |
-out=$(eval $cmd)
|
|
|
5fd609 |
+out=$(eval "$cmd")
|
|
|
5fd609 |
ret=$?
|
|
|
5fd609 |
if [ $ret -ne 0 ]; then
|
|
|
5fd609 |
echo "Loading privkey failed"
|
|
|
5fd609 |
@@ -52,15 +71,15 @@ if [ $ret -ne 0 ]; then
|
|
|
5fd609 |
exit 1
|
|
|
5fd609 |
fi
|
|
|
5fd609 |
|
|
|
5fd609 |
-cat $PUBKEY
|
|
|
5fd609 |
+cat "$PUBKEY"
|
|
|
5fd609 |
|
|
|
5fd609 |
-ls -l $TESTDIR
|
|
|
5fd609 |
+ls -l "$TESTDIR"
|
|
|
5fd609 |
|
|
|
5fd609 |
-if [ $LOADPUBLIC -ne 0 ]; then
|
|
|
5fd609 |
+if [ "$LOADPUBLIC" -ne 0 ]; then
|
|
|
5fd609 |
#load public key
|
|
|
5fd609 |
- cmd='p11tool --provider /usr/lib64/pkcs11/libsofthsm2.so --write --load-pubkey "$PUBKEY" --label "$OBJNAME" --login --set-pin=1234 "pkcs11:token="$OBJNAME""'
|
|
|
5fd609 |
+ cmd="p11tool --provider $LIBSOFTHSM_PATH --write --load-pubkey $PUBKEY --label $OBJNAME --login --set-pin=1234 \"pkcs11:token=$OBJNAME\""
|
|
|
5fd609 |
eval echo "$cmd"
|
|
|
5fd609 |
- out=$(eval $cmd)
|
|
|
5fd609 |
+ out=$(eval "$cmd")
|
|
|
5fd609 |
ret=$?
|
|
|
5fd609 |
if [ $ret -ne 0 ]; then
|
|
|
5fd609 |
echo "Loading pubkey failed"
|
|
|
5fd609 |
@@ -69,9 +88,9 @@ if [ $LOADPUBLIC -ne 0 ]; then
|
|
|
5fd609 |
fi
|
|
|
5fd609 |
fi
|
|
|
5fd609 |
|
|
|
5fd609 |
-cmd='p11tool --list-all --login "pkcs11:token="$OBJNAME"" --set-pin=1234'
|
|
|
5fd609 |
+cmd="p11tool --list-all --login \"pkcs11:token=$OBJNAME\" --set-pin=1234"
|
|
|
5fd609 |
eval echo "$cmd"
|
|
|
5fd609 |
-out=$(eval $cmd)
|
|
|
5fd609 |
+out=$(eval "$cmd")
|
|
|
5fd609 |
ret=$?
|
|
|
5fd609 |
if [ $ret -ne 0 ]; then
|
|
|
5fd609 |
echo "Loging failed"
|