Make tdefaultslot to test stored pubkey slot

Author: bukka

tests/meson.build

@@ -105,7 +105,6 @@ test_programs = {
   'treadkeys': ['treadkeys.c'],
   'tcmpkeys': ['tcmpkeys.c', 'util.c'],
   'tfork': ['tfork.c', 'util.c'],
-  'trefresh': ['trefresh.c', 'util.c'],
   'tstorepubkey': ['tstorepubkey.c', 'util.c'],
   'tpkey': ['tpkey.c', 'util.c'],
   'pincache': ['pincache.c'],

tests/setup.sh

@@ -808,6 +808,7 @@ export BASEURI2WITHPINVALUE="${BASEURI2WITHPINVALUE}"
 export BASEURI2="${BASEURI2}"
 export PUBURI2="${PUBURI2}"
 export PRIURI2="${PRIURI2}"
+export SLOT2ID="${SLOT2ID}"
 DBGSCRIPT
 fi
 

tests/tdefaultslot

@@ -4,25 +4,16 @@
 
 source "${TESTSSRCDIR}/helpers.sh"
 
-title PARA "Test PKCS11 SLOTS"
 ORIG_OPENSSL_CONF=${OPENSSL_CONF}
 sed -e "s/#pkcs11-module-default-slot-id/pkcs11-module-default-slot-id = 52/" \
     -e "s/^pkcs11-module-token-pin.*$/pkcs11-module-token-pin = 11111111/" \
     "${OPENSSL_CONF}" > "${OPENSSL_CONF}.defaultslot"
 export OPENSSL_CONF=${OPENSSL_CONF}.defaultslot
 
-title PARA "Sign and Verify with provided Hash and RSA"
-ossl 'pkey -in "${PRIURI2}" -pubout -out ${TMPPDIR}/defaultslot_public.pem'
-ossl 'dgst -sha256 -binary -out ${TMPPDIR}/sha256.bin ${SEEDFILE}'
-ossl '
-pkeyutl -sign -inkey "${PRIURI2}"
-              -in ${TMPPDIR}/sha256.bin
-              -out ${TMPPDIR}/sha256-sig.bin
-              -pkeyopt digest:sha256'
+title PARA "Test PKCS11 SLOTS default slot - pub key storing"
+"${TESTBLDDIR}/tstorepubkey" "${PUBURI2}"
 
-env
-
-# echo $CHECKER "${TESTBLDDIR}/trefresh" "${PRIURI2}" "${PUBURI2}" ${SEEDFILE} "${TMPPDIR}/sha256-sig.bin"
-echo $CHECKER "${TESTBLDDIR}/tstorepubkey" "${PRIURI2}" "${PUBURI2}" ${SEEDFILE} "${TMPPDIR}/sha256-sig.bin"
+title PARA "Test PKCS11 SLOTS default slot - checking slot"
+pkcs11-tool --module "${P11LIB}" --slot "${SLOT2ID}" -O | grep 'id=%02%01;object=testKey' -q
 
 export OPENSSL_CONF=${ORIG_OPENSSL_CONF}