From a271211a46515cc5512cc3a70dad5cec98626ccf Mon Sep 17 00:00:00 2001
From: Karel Srot <ksrot@redhat.com>
Date: Mon, 31 Oct 2022 10:33:48 +0100
Subject: [PATCH] Adjust for opencryptoki v3.19.0

---
 .../runtest.sh                                | 22 +++++++++----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/Sanity/p11sak-key-management-tool-basic-functionality/runtest.sh b/Sanity/p11sak-key-management-tool-basic-functionality/runtest.sh
index 0c3773e..bfe3cbe 100755
--- a/Sanity/p11sak-key-management-tool-basic-functionality/runtest.sh
+++ b/Sanity/p11sak-key-management-tool-basic-functionality/runtest.sh
@@ -52,34 +52,34 @@ rlJournalStart
 
     rlPhaseStartTest "Test key generation and listing"
         rlRun -s "p11sak generate-key aes 128 --slot $SLOT --pin $pkcsUSER_PIN --label aes_key --attr ED"
-        rlAssertGrep "Generate symmetric key AES with keylen=128 and label=\[aes_key\]" $rlRun_LOG
+        rlAssertGrep 'Generate symmetric key AES with keylen=128 and label="?\[aes_key\]"?' $rlRun_LOG -E
         rlAssertGrep "Symmetric key generation successful!" $rlRun_LOG
         rlRun -s "p11sak list-key aes --slot $SLOT --pin $pkcsUSER_PIN"
-    rlAssertGrep "AES 128 | aes_key" $rlRun_LOG
+        rlAssertGrep 'AES 128 | "?aes_key"?' $rlRun_LOG -E
 
         rlRun -s "p11sak gen-key 3des --slot $SLOT --pin $pkcsUSER_PIN --label 3des_key"
-        rlAssertGrep "Generate symmetric key 3DES with keylen=192 and label=\[3des_key\]" $rlRun_LOG
+        rlAssertGrep 'Generate symmetric key 3DES with keylen=192 and label="?\[3des_key\]"?' $rlRun_LOG -E
         rlAssertGrep "Symmetric key generation successful!" $rlRun_LOG
         rlRun -s "p11sak ls-key 3des --slot $SLOT --pin $pkcsUSER_PIN"
-        rlAssertGrep "3DES | 3des_key" $rlRun_LOG
+        rlAssertGrep '3DES | "?3des_key"?' $rlRun_LOG -E
 
         rlRun -s "p11sak gen-key rsa 2048 --exponent 65537 --slot $SLOT --pin $pkcsUSER_PIN --label rsa_key"
         rlAssertGrep "Generate asymmetric key: RSA_PKCS" $rlRun_LOG
         rlAssertGrep "Asymmetric key pair generation successful!" $rlRun_LOG
         rlRun -s "p11sak ls-key rsa --slot $SLOT --pin $pkcsUSER_PIN"
-        rlAssertGrep "public RSA | rsa_key:pub" $rlRun_LOG
-        rlAssertGrep "private RSA | rsa_key:prv" $rlRun_LOG
+        rlAssertGrep 'public RSA | "?rsa_key:pub"?' $rlRun_LOG -E
+        rlAssertGrep 'private RSA | "?rsa_key:prv"?' $rlRun_LOG -E
 
         rlRun -s "p11sak gen-key ec prime256v1 --slot $SLOT --pin $pkcsUSER_PIN --label ec_key"
         rlAssertGrep "Generate asymmetric key: EC" $rlRun_LOG
         rlRun -s "p11sak ls secret --long --slot $SLOT --pin $pkcsUSER_PIN"
-        rlAssertGrep "Label: aes_key" $rlRun_LOG
-        rlAssertGrep "Label: 3des_key" $rlRun_LOG
-        rlAssertNotGrep "Label: rsa_key" $rlRun_LOG
+        rlAssertGrep 'Label: "?aes_key"?' $rlRun_LOG -E
+        rlAssertGrep 'Label: "?3des_key"?' $rlRun_LOG -E
+        rlAssertNotGrep 'Label: "?rsa_key"?' $rlRun_LOG -E
 
         rlRun -s "p11sak ls private --long --slot $SLOT --pin $pkcsUSER_PIN"
-        rlAssertGrep "Label: rsa_key:prv" $rlRun_LOG
-        rlAssertNotGrep "Label: rsa_key:pub" $rlRun_LOG
+        rlAssertGrep 'Label: "?rsa_key:prv"?' $rlRun_LOG -E
+        rlAssertNotGrep 'Label: "?rsa_key:pub"?' $rlRun_LOG -E
     rlPhaseEnd
 
 if nvrTestPackage opencryptoki '>=' 3.17.0; then