imgtool: Add missing encodings to emitter tests

Signed-off-by: David Vincze <david.vincze@arm.com> Change-Id: Iff37cb62514b181a30f5537d6692d55e3d9c73ed
mcu-tools · Aug 1, 2024 · f763c5f · f763c5f
1 parent 3f11286
commit f763c5f
Show file tree

Hide file tree

Showing 2 changed files with 40 additions and 2 deletions.
diff --git a/scripts/imgtool/keys/ecdsa_test.py b/scripts/imgtool/keys/ecdsa_test.py
@@ -52,17 +52,36 @@ def test_emit(self):
         """Basic sanity check on the code emitters."""
         k = ECDSA256P1.generate()
 
+        pubpem = io.StringIO()
+        k.emit_public_pem(pubpem)
+        self.assertIn("BEGIN PUBLIC KEY", pubpem.getvalue())
+        self.assertIn("END PUBLIC KEY", pubpem.getvalue())
+
         ccode = io.StringIO()
         k.emit_c_public(ccode)
         self.assertIn("ecdsa_pub_key", ccode.getvalue())
         self.assertIn("ecdsa_pub_key_len", ccode.getvalue())
 
+        hashccode = io.StringIO()
+        k.emit_c_public_hash(hashccode)
+        self.assertIn("ecdsa_pub_key_hash", hashccode.getvalue())
+        self.assertIn("ecdsa_pub_key_hash_len", hashccode.getvalue())
+
         rustcode = io.StringIO()
         k.emit_rust_public(rustcode)
         self.assertIn("ECDSA_PUB_KEY", rustcode.getvalue())
 
+        # raw data - bytes
+        pubraw = io.BytesIO()
+        k.emit_raw_public(pubraw)
+        self.assertTrue(len(pubraw.getvalue()) > 0)
+
+        hashraw = io.BytesIO()
+        k.emit_raw_public_hash(hashraw)
+        self.assertTrue(len(hashraw.getvalue()) > 0)
+
     def test_emit_pub(self):
-        """Basic sanity check on the code emitters."""
+        """Basic sanity check on the code emitters, from public key."""
         pubname = self.tname("public.pem")
         k = ECDSA256P1.generate()
         k.export_public(pubname)

diff --git a/scripts/imgtool/keys/ed25519_test.py b/scripts/imgtool/keys/ed25519_test.py
@@ -53,17 +53,36 @@ def test_emit(self):
         """Basic sanity check on the code emitters."""
         k = Ed25519.generate()
 
+        pubpem = io.StringIO()
+        k.emit_public_pem(pubpem)
+        self.assertIn("BEGIN PUBLIC KEY", pubpem.getvalue())
+        self.assertIn("END PUBLIC KEY", pubpem.getvalue())
+
         ccode = io.StringIO()
         k.emit_c_public(ccode)
         self.assertIn("ed25519_pub_key", ccode.getvalue())
         self.assertIn("ed25519_pub_key_len", ccode.getvalue())
 
+        hashccode = io.StringIO()
+        k.emit_c_public_hash(hashccode)
+        self.assertIn("ed25519_pub_key_hash", hashccode.getvalue())
+        self.assertIn("ed25519_pub_key_hash_len", hashccode.getvalue())
+
         rustcode = io.StringIO()
         k.emit_rust_public(rustcode)
         self.assertIn("ED25519_PUB_KEY", rustcode.getvalue())
 
+        # raw data - bytes
+        pubraw = io.BytesIO()
+        k.emit_raw_public(pubraw)
+        self.assertTrue(len(pubraw.getvalue()) > 0)
+
+        hashraw = io.BytesIO()
+        k.emit_raw_public_hash(hashraw)
+        self.assertTrue(len(hashraw.getvalue()) > 0)
+
     def test_emit_pub(self):
-        """Basic sanity check on the code emitters."""
+        """Basic sanity check on the code emitters, from public key."""
         pubname = self.tname("public.pem")
         k = Ed25519.generate()
         k.export_public(pubname)