OrgZephyr/mcuboot
OrgZephyr
/
mcuboot
mirror of https://github.com/zephyrproject-rtos/mcuboot.git
1
0
Fork 0
Code Issues Releases Wiki Activity

imgtool: keys: fix tests 

Fix tests that were broken due to changes in key interfaces.

Signed-off-by: Fabio Utzig <utzig@apache.org>
This commit is contained in:
Fabio Utzig 2020-04-02 13:44:30 -03:00 committed by Fabio Utzig
parent 41c5d50ec7
commit 9560d77371
3 changed files with 22 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
scripts/imgtool/keys/ecdsa_test.py
View File

@ -51,12 +51,12 @@ class EcKeyGeneration(unittest.TestCase):
k = ECDSA256P1.generate()
ccode = io.StringIO()
k.emit_c(ccode)
k.emit_c_public(ccode)
self.assertIn("ecdsa_pub_key", ccode.getvalue())
self.assertIn("ecdsa_pub_key_len", ccode.getvalue())
rustcode = io.StringIO()
k.emit_rust(rustcode)
k.emit_rust_public(rustcode)
self.assertIn("ECDSA_PUB_KEY", rustcode.getvalue())
def test_emit_pub(self):
@ -68,12 +68,12 @@ class EcKeyGeneration(unittest.TestCase):
k2 = load(pubname)
ccode = io.StringIO()
k2.emit_c(ccode)
k2.emit_c_public(ccode)
self.assertIn("ecdsa_pub_key", ccode.getvalue())
self.assertIn("ecdsa_pub_key_len", ccode.getvalue())
rustcode = io.StringIO()
k2.emit_rust(rustcode)
k2.emit_rust_public(rustcode)
self.assertIn("ECDSA_PUB_KEY", rustcode.getvalue())
def test_sig(self):

21
scripts/imgtool/keys/ed25519_test.py
View File

@ -2,6 +2,7 @@
Tests for ECDSA keys
"""
import hashlib
import io
import os.path
import sys
@ -51,12 +52,12 @@ class Ed25519KeyGeneration(unittest.TestCase):
k = Ed25519.generate()
ccode = io.StringIO()
k.emit_c(ccode)
k.emit_c_public(ccode)
self.assertIn("ed25519_pub_key", ccode.getvalue())
self.assertIn("ed25519_pub_key_len", ccode.getvalue())
rustcode = io.StringIO()
k.emit_rust(rustcode)
k.emit_rust_public(rustcode)
self.assertIn("ED25519_PUB_KEY", rustcode.getvalue())
def test_emit_pub(self):
@ -68,28 +69,34 @@ class Ed25519KeyGeneration(unittest.TestCase):
k2 = load(pubname)
ccode = io.StringIO()
k2.emit_c(ccode)
k2.emit_c_public(ccode)
self.assertIn("ed25519_pub_key", ccode.getvalue())
self.assertIn("ed25519_pub_key_len", ccode.getvalue())
rustcode = io.StringIO()
k2.emit_rust(rustcode)
k2.emit_rust_public(rustcode)
self.assertIn("ED25519_PUB_KEY", rustcode.getvalue())
def test_sig(self):
k = Ed25519.generate()
buf = b'This is the message'
sig = k.raw_sign(buf)
sha = hashlib.sha256()
sha.update(buf)
digest = sha.digest()
sig = k.sign_digest(digest)
# The code doesn't have any verification, so verify this
# manually.
k.key.public_key().verify(signature=sig, data=buf)
k.key.public_key().verify(signature=sig, data=digest)
# Modify the message to make sure the signature fails.
sha = hashlib.sha256()
sha.update(b'This is thE message')
new_digest = sha.digest()
self.assertRaises(InvalidSignature,
k.key.public_key().verify,
signature=sig,
data=b'This is thE message')
data=new_digest)
if __name__ == '__main__':

8
scripts/imgtool/keys/rsa_test.py
View File

@ -62,12 +62,12 @@ class KeyGeneration(unittest.TestCase):
k = RSA.generate(key_size=key_size)
ccode = io.StringIO()
k.emit_c(ccode)
k.emit_c_public(ccode)
self.assertIn("rsa_pub_key", ccode.getvalue())
self.assertIn("rsa_pub_key_len", ccode.getvalue())
rustcode = io.StringIO()
k.emit_rust(rustcode)
k.emit_rust_public(rustcode)
self.assertIn("RSA_PUB_KEY", rustcode.getvalue())
def test_emit_pub(self):
@ -80,12 +80,12 @@ class KeyGeneration(unittest.TestCase):
k2 = load(pubname)
ccode = io.StringIO()
k2.emit_c(ccode)
k2.emit_c_public(ccode)
self.assertIn("rsa_pub_key", ccode.getvalue())
self.assertIn("rsa_pub_key_len", ccode.getvalue())
rustcode = io.StringIO()
k2.emit_rust(rustcode)
k2.emit_rust_public(rustcode)
self.assertIn("RSA_PUB_KEY", rustcode.getvalue())
def test_sig(self):