Skip to content

Commit f763c5f

Browse files
committed
imgtool: Add missing encodings to emitter tests
Signed-off-by: David Vincze <[email protected]> Change-Id: Iff37cb62514b181a30f5537d6692d55e3d9c73ed
1 parent 3f11286 commit f763c5f

File tree

2 files changed

+40
-2
lines changed

2 files changed

+40
-2
lines changed

scripts/imgtool/keys/ecdsa_test.py

Lines changed: 20 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,17 +52,36 @@ def test_emit(self):
5252
"""Basic sanity check on the code emitters."""
5353
k = ECDSA256P1.generate()
5454

55+
pubpem = io.StringIO()
56+
k.emit_public_pem(pubpem)
57+
self.assertIn("BEGIN PUBLIC KEY", pubpem.getvalue())
58+
self.assertIn("END PUBLIC KEY", pubpem.getvalue())
59+
5560
ccode = io.StringIO()
5661
k.emit_c_public(ccode)
5762
self.assertIn("ecdsa_pub_key", ccode.getvalue())
5863
self.assertIn("ecdsa_pub_key_len", ccode.getvalue())
5964

65+
hashccode = io.StringIO()
66+
k.emit_c_public_hash(hashccode)
67+
self.assertIn("ecdsa_pub_key_hash", hashccode.getvalue())
68+
self.assertIn("ecdsa_pub_key_hash_len", hashccode.getvalue())
69+
6070
rustcode = io.StringIO()
6171
k.emit_rust_public(rustcode)
6272
self.assertIn("ECDSA_PUB_KEY", rustcode.getvalue())
6373

74+
# raw data - bytes
75+
pubraw = io.BytesIO()
76+
k.emit_raw_public(pubraw)
77+
self.assertTrue(len(pubraw.getvalue()) > 0)
78+
79+
hashraw = io.BytesIO()
80+
k.emit_raw_public_hash(hashraw)
81+
self.assertTrue(len(hashraw.getvalue()) > 0)
82+
6483
def test_emit_pub(self):
65-
"""Basic sanity check on the code emitters."""
84+
"""Basic sanity check on the code emitters, from public key."""
6685
pubname = self.tname("public.pem")
6786
k = ECDSA256P1.generate()
6887
k.export_public(pubname)

scripts/imgtool/keys/ed25519_test.py

Lines changed: 20 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,17 +53,36 @@ def test_emit(self):
5353
"""Basic sanity check on the code emitters."""
5454
k = Ed25519.generate()
5555

56+
pubpem = io.StringIO()
57+
k.emit_public_pem(pubpem)
58+
self.assertIn("BEGIN PUBLIC KEY", pubpem.getvalue())
59+
self.assertIn("END PUBLIC KEY", pubpem.getvalue())
60+
5661
ccode = io.StringIO()
5762
k.emit_c_public(ccode)
5863
self.assertIn("ed25519_pub_key", ccode.getvalue())
5964
self.assertIn("ed25519_pub_key_len", ccode.getvalue())
6065

66+
hashccode = io.StringIO()
67+
k.emit_c_public_hash(hashccode)
68+
self.assertIn("ed25519_pub_key_hash", hashccode.getvalue())
69+
self.assertIn("ed25519_pub_key_hash_len", hashccode.getvalue())
70+
6171
rustcode = io.StringIO()
6272
k.emit_rust_public(rustcode)
6373
self.assertIn("ED25519_PUB_KEY", rustcode.getvalue())
6474

75+
# raw data - bytes
76+
pubraw = io.BytesIO()
77+
k.emit_raw_public(pubraw)
78+
self.assertTrue(len(pubraw.getvalue()) > 0)
79+
80+
hashraw = io.BytesIO()
81+
k.emit_raw_public_hash(hashraw)
82+
self.assertTrue(len(hashraw.getvalue()) > 0)
83+
6584
def test_emit_pub(self):
66-
"""Basic sanity check on the code emitters."""
85+
"""Basic sanity check on the code emitters, from public key."""
6786
pubname = self.tname("public.pem")
6887
k = Ed25519.generate()
6988
k.export_public(pubname)

0 commit comments

Comments
 (0)