Report a failing PKCS#11 example instead of always exiting 0

Author: aidangarske

pkcs11/softhsm2-init.sh

@@ -0,0 +1,23 @@
+#!/bin/sh
+
+set -e
+
+cd "$(dirname "$0")"
+
+./mksofthsm2_conf.sh
+SOFTHSM2_CONF="$PWD/softhsm2.conf"
+export SOFTHSM2_CONF
+
+out=$(softhsm2-util --init-token --slot 0 --label SoftToken \
+        --so-pin cryptoki --pin cryptoki)
+echo "$out"
+
+# SoftHSM reassigns the token to a random slot, so the id cannot be hardcoded
+slotid=$(echo "$out" | sed -n 's/.*reassigned to slot \([0-9][0-9]*\).*/\1/p')
+if [ -z "$slotid" ]
+then
+  echo "could not read the reassigned slot id from softhsm2-util" >&2
+  exit 1
+fi
+
+exec ./softhsm2.sh "$slotid" "$@"

pkcs11/softhsm2.sh

@@ -3,31 +3,79 @@
 if [ $# -gt 0 ]
 then
   SOFTHSM2_SLOTID=$1
+  shift
 fi
 
+# the README builds SoftHSM from source into /usr/local, but a distro package
+# lands in /usr/lib; SOFTHSM2_LIB overrides both
+if [ -z "$SOFTHSM2_LIB" ]
+then
+  for lib in /usr/local/lib/softhsm/libsofthsm2.so \
+             /usr/lib/softhsm/libsofthsm2.so \
+             /usr/lib/x86_64-linux-gnu/softhsm/libsofthsm2.so \
+             /opt/homebrew/lib/softhsm/libsofthsm2.so
+  do
+    if [ -f "$lib" ]
+    then
+      SOFTHSM2_LIB=$lib
+      break
+    fi
+  done
+fi
+
+if [ ! -f "$SOFTHSM2_LIB" ]
+then
+  echo "libsofthsm2.so not found, set SOFTHSM2_LIB to its path" >&2
+  exit 1
+fi
+
+if [ -z "$SOFTHSM2_SLOTID" ]
+then
+  echo "no slot id, pass it as \$1 or set SOFTHSM2_SLOTID" >&2
+  exit 1
+fi
+
+rc=0
+
+run_example()
+{
+  name=$1
+  shift
+  echo
+  echo "# $name"
+  if ! "$@" "$SOFTHSM2_LIB" "$SOFTHSM2_SLOTID" SoftToken cryptoki
+  then
+    echo "# FAILED: $name"
+    rc=1
+  fi
+}
+
 echo "# Using slot ID: $SOFTHSM2_SLOTID"
+echo "# Using library: $SOFTHSM2_LIB"
+
+if [ $# -gt 0 ]
+then
+  for example in "$@"
+  do
+    run_example "$example" "./$example"
+  done
+else
+  run_example "RSA example" ./pkcs11_rsa
+  run_example "ECC example" ./pkcs11_ecc
+  run_example "Generate ECC example" ./pkcs11_genecc
+  run_example "AES-GCM example" ./pkcs11_aesgcm
+  run_example "AES-CBC example" ./pkcs11_aescbc
+  run_example "HMAC example" ./pkcs11_hmac
+  run_example "Random Number Generation example" ./pkcs11_rand
+  run_example "PKCS#11 test" ./pkcs11_test
+fi
+
 echo
-echo "# RSA example"
-./pkcs11_rsa /usr/local/lib/softhsm/libsofthsm2.so $SOFTHSM2_SLOTID SoftToken cryptoki
-echo
-echo "# ECC example"
-./pkcs11_ecc /usr/local/lib/softhsm/libsofthsm2.so $SOFTHSM2_SLOTID SoftToken cryptoki
-echo
-echo "# Generate ECC example"
-./pkcs11_genecc /usr/local/lib/softhsm/libsofthsm2.so $SOFTHSM2_SLOTID SoftToken cryptoki
-echo
-echo "# AES-GCM example"
-./pkcs11_aesgcm /usr/local/lib/softhsm/libsofthsm2.so $SOFTHSM2_SLOTID SoftToken cryptoki
-echo
-echo "# AES-CBC example"
-./pkcs11_aescbc /usr/local/lib/softhsm/libsofthsm2.so $SOFTHSM2_SLOTID SoftToken cryptoki
-echo
-echo "# HMAC example"
-./pkcs11_hmac /usr/local/lib/softhsm/libsofthsm2.so $SOFTHSM2_SLOTID SoftToken cryptoki
-echo
-echo "# Random Number Generation example"
-./pkcs11_rand /usr/local/lib/softhsm/libsofthsm2.so $SOFTHSM2_SLOTID SoftToken cryptoki
-echo
-echo "# PKCS#11 test"
-./pkcs11_test /usr/local/lib/softhsm/libsofthsm2.so $SOFTHSM2_SLOTID SoftToken cryptoki
+if [ $rc -eq 0 ]
+then
+  echo "# All PKCS#11 examples passed"
+else
+  echo "# One or more PKCS#11 examples FAILED"
+fi
 
+exit $rc