From 64bb7542f4398dd4be01e6a2aabef691423e4aac Mon Sep 17 00:00:00 2001 From: Karel Srot Date: Tue, 10 May 2022 10:58:04 +0200 Subject: [PATCH] Reset tokens before doing the initialization --- Sanity/openCryptoki-PIN-conversion-tool/runtest.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Sanity/openCryptoki-PIN-conversion-tool/runtest.sh b/Sanity/openCryptoki-PIN-conversion-tool/runtest.sh index c3b2698..b709758 100755 --- a/Sanity/openCryptoki-PIN-conversion-tool/runtest.sh +++ b/Sanity/openCryptoki-PIN-conversion-tool/runtest.sh @@ -42,6 +42,7 @@ rlJournalStart rlRun "TmpDir=\$(mktemp -d)" 0 "Creating tmp directory" rlRun "pushd $TmpDir" rlFileBackup /etc/opencryptoki/opencryptoki.conf + [ -f /etc/opencryptoki/opencryptoki.conf_BAK ] && rlFileBackup /etc/opencryptoki/opencryptoki.conf_BAK && rlRun "rm -f /etc/opencryptoki/opencryptoki.conf_BAK" rlServiceStop pkcsslotd rlRun "pkcsResetTokens" rlServiceStart pkcsslotd @@ -49,6 +50,8 @@ rlJournalStart rlRun "pkcsconf -t" SLOT=$( pkcsGetTokenSlot $TOKEN ) MODEL=$( pkcsconf -t -c $SLOT | awk '/Model:/ { print $2 }' ) + rlServiceStop pkcsslotd + rlRun "pkcsResetTokens" rlRun "sed -i '/tokversion = 3.12/ d' /etc/opencryptoki/opencryptoki.conf" 0 "Remove tokversion = 3.12 from opencryptoki.conf if present" # add token description to reproduce bz#1987256 TEXT='description = "My Token"\nmanufacturer = "MyCompany Inc."'