From ca3e6556cff4835b09e7628ef406adce50831894 Mon Sep 17 00:00:00 2001 From: Karel Srot Date: Thu, 20 Mar 2025 13:46:41 +0100 Subject: [PATCH] Pass --slot attribute to pkcs11-tool --- Update/initialized-ica-token/runtest.sh | 6 +++--- Update/initialized-sw-token/runtest.sh | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Update/initialized-ica-token/runtest.sh b/Update/initialized-ica-token/runtest.sh index d3858bf..35d83e0 100755 --- a/Update/initialized-ica-token/runtest.sh +++ b/Update/initialized-ica-token/runtest.sh @@ -49,7 +49,7 @@ function phaseSetup() { rlRun "p11tool --generate-rsa --login --set-pin $pkcsUSER_PIN --provider=/usr/lib64/pkcs11/libopencryptoki.so --outfile id_rsa.pub 'pkcs11:$TokenSpec' --label id_rsa.pub" fi rlAssertExists id_rsa.pub - rlRun -s "pkcs11-tool -v --module /usr/lib64/opencryptoki/libopencryptoki.so --list-objects" + rlRun -s "pkcs11-tool -v --module /usr/lib64/opencryptoki/libopencryptoki.so --slot 0x$SLOT --list-objects" rlAssertGrep "Public Key Object" $rlRun_LOG rlAssertGrep "label: *id_rsa.pub" $rlRun_LOG -E rlPhaseEnd @@ -59,11 +59,11 @@ function phaseSetup() { function phaseTest() { rlPhaseStartTest rlRun "pkcsconf -t" - rlRun -s "pkcs11-tool -v --module /usr/lib64/opencryptoki/libopencryptoki.so --list-objects" 0 "Verify I still can list imported RSA key" + rlRun -s "pkcs11-tool -v --module /usr/lib64/opencryptoki/libopencryptoki.so --slot 0x$SLOT --list-objects" 0 "Verify I still can list imported RSA key" rlAssertGrep "Public Key Object" $rlRun_LOG rlAssertGrep "label: *id_rsa.pub" $rlRun_LOG -E rlLog "Exporting stored RSA key" - rlRun "pkcs11-tool -v --module /usr/lib64/opencryptoki/libopencryptoki.so --read-object --type pubkey --label id_rsa.pub --output-file exported_key.der" + rlRun "pkcs11-tool -v --module /usr/lib64/opencryptoki/libopencryptoki.so --slot 0x$SLOT --read-object --type pubkey --label id_rsa.pub --output-file exported_key.der" rlRun "openssl rsa -pubin -inform DER -in exported_key.der -out exported_key.pub" 0 "Converting from DER format" rlRun "diff exported_key.pub id_rsa.pub" 0 "There should be no difference when compared with the original key" rlPhaseEnd diff --git a/Update/initialized-sw-token/runtest.sh b/Update/initialized-sw-token/runtest.sh index 78e7e40..494d740 100755 --- a/Update/initialized-sw-token/runtest.sh +++ b/Update/initialized-sw-token/runtest.sh @@ -49,7 +49,7 @@ function phaseSetup() { rlRun "p11tool --generate-rsa --login --set-pin $pkcsUSER_PIN --provider=/usr/lib64/pkcs11/libopencryptoki.so --outfile id_rsa.pub 'pkcs11:$TokenSpec' --label id_rsa.pub" fi rlAssertExists id_rsa.pub - rlRun -s "pkcs11-tool -v --module /usr/lib64/opencryptoki/libopencryptoki.so --list-objects" + rlRun -s "pkcs11-tool -v --module /usr/lib64/opencryptoki/libopencryptoki.so --slot 0x$SLOT --list-objects" rlAssertGrep "Public Key Object" $rlRun_LOG rlAssertGrep "label: *id_rsa.pub" $rlRun_LOG -E rlPhaseEnd @@ -59,11 +59,11 @@ function phaseSetup() { function phaseTest() { rlPhaseStartTest rlRun "pkcsconf -t" - rlRun -s "pkcs11-tool -v --module /usr/lib64/opencryptoki/libopencryptoki.so --list-objects" 0 "Verify I still can list imported RSA key" + rlRun -s "pkcs11-tool -v --module /usr/lib64/opencryptoki/libopencryptoki.so --slot 0x$SLOT --list-objects" 0 "Verify I still can list imported RSA key" rlAssertGrep "Public Key Object" $rlRun_LOG rlAssertGrep "label: *id_rsa.pub" $rlRun_LOG -E rlLog "Exporting stored RSA key" - rlRun "pkcs11-tool -v --module /usr/lib64/opencryptoki/libopencryptoki.so --read-object --type pubkey --label id_rsa.pub --output-file exported_key.der" + rlRun "pkcs11-tool -v --module /usr/lib64/opencryptoki/libopencryptoki.so --slot 0x$SLOT --read-object --type pubkey --label id_rsa.pub --output-file exported_key.der" rlRun "openssl rsa -pubin -inform DER -in exported_key.der -out exported_key.pub" 0 "Converting from DER format" rlRun "diff exported_key.pub id_rsa.pub" 0 "There should be no difference when compared with the original key" rlRun "popd"