commit c7404e97c53a5c33dfd537ef2e278a6492d5dd08
author Mate Toth-Pal <mate.toth-pal@arm.com> Fri Jul 15 11:11:13 2022 +0200
committer Anton Komlev <Anton.Komlev@arm.com> Wed Oct 05 17:46:05 2022 +0200
tree 8534eddb08720827758c4ea5797361b5bf289e77
parent 1093a8a1d898e22be3bcb6e881c8cf8abc27f227

Refactor token parsing to keep data in a tree

Refactor token parsing to keep data in a tree of TokenItem objects.
For each data item the Claim type is stored.

Change-Id: I8bd33b51b7fb8ff86bfdce8ffe3c0c7f9bac5895
Signed-off-by: Mate Toth-Pal <mate.toth-pal@arm.com>

iat-verifier/tests/test_verifier.py

diff --git a/iat-verifier/tests/test_verifier.py b/iat-verifier/tests/test_verifier.py
index ed3a725..bb03513 100644
--- a/iat-verifier/tests/test_verifier.py
+++ b/iat-verifier/tests/test_verifier.py
@@ -58,20 +58,19 @@
         #dump_file_binary(good_sig)
 
         with open(good_sig, 'rb') as wfh:
-            verifier_good_sig.parse_token(
-                token=wfh.read(),
-                verify=True,
-                check_p_header=False,
-                lower_case_key=False)
-
+            token_item = verifier_good_sig.parse_token(
+                         token=wfh.read(),
+                         check_p_header=False,
+                         lower_case_key=False)
+            token_item.verify()
 
         with self.assertRaises(ValueError) as test_ctx:
             with open(bad_sig, 'rb') as wfh:
-                verifier_good_sig.parse_token(
+                token_item = verifier_good_sig.parse_token(
                     token=wfh.read(),
-                    verify=True,
                     check_p_header=False,
                     lower_case_key=False)
+                token_item.verify()
 
         self.assertIn('Bad signature', test_ctx.exception.args[0])
 
@@ -223,7 +222,7 @@
             PSAIoTProfile1TokenVerifier(method=method,
             cose_alg=cose_alg,
             signing_key=signing_key,
-            configuration=self.config))
+            configuration=self.config)).get_token_map()
         self.assertEqual(iat['SECURITY_LIFECYCLE'], 'SL_SECURED')
 
     def test_security_lifecycle_decoding(self):
@@ -237,5 +236,5 @@
             PSAIoTProfile1TokenVerifier(method=method,
             cose_alg=cose_alg,
             signing_key=signing_key,
-            configuration=self.config))
+            configuration=self.config)).get_token_map()
         self.assertEqual(iat['SECURITY_LIFECYCLE'], 'SL_SECURED')