From 677cceb130ccdf792b598b11f5f204f15c693c8f Mon Sep 17 00:00:00 2001 From: Pol Henarejos Date: Fri, 29 Dec 2023 19:07:20 +0100 Subject: [PATCH] Update to latest PicoHSM. Signed-off-by: Pol Henarejos --- tests/pico-hsm/test_004_key_domains.py | 13 +++++++++---- tests/pico-hsm/test_005_dkek.py | 13 +++++++++---- 2 files changed, 18 insertions(+), 8 deletions(-) diff --git a/tests/pico-hsm/test_004_key_domains.py b/tests/pico-hsm/test_004_key_domains.py index 74a3beb..4176d8d 100644 --- a/tests/pico-hsm/test_004_key_domains.py +++ b/tests/pico-hsm/test_004_key_domains.py @@ -69,14 +69,19 @@ def test_set_key_domain_ok(device): def test_import_dkek_ok(device): resp = device.import_dkek(DEFAULT_DKEK, key_domain=TEST_KEY_DOMAIN) - assert(resp[0] == DEFAULT_DKEK_SHARES) - assert(resp[1] == DEFAULT_DKEK_SHARES-1) + assert('dkek' in resp) + assert('kcv' in resp) + assert(resp['dkek']['total'] == DEFAULT_DKEK_SHARES) + assert(resp['dkek']['missing'] == DEFAULT_DKEK_SHARES-1) resp = device.import_dkek(DEFAULT_DKEK, key_domain=TEST_KEY_DOMAIN) - assert(resp[1] == DEFAULT_DKEK_SHARES-2) + assert('dkek' in resp) + assert('kcv' in resp) + assert(resp['dkek']['total'] == DEFAULT_DKEK_SHARES) + assert(resp['dkek']['missing'] == DEFAULT_DKEK_SHARES-2) kcv = hashlib.sha256(b'\x00'*32).digest()[:8] - assert(resp[2:] == kcv) + assert(resp['kcv'] == kcv) def test_clear_key_domain(device): kd = device.get_key_domain(key_domain=0) diff --git a/tests/pico-hsm/test_005_dkek.py b/tests/pico-hsm/test_005_dkek.py index 5c5fddc..fb7f72e 100644 --- a/tests/pico-hsm/test_005_dkek.py +++ b/tests/pico-hsm/test_005_dkek.py @@ -26,12 +26,17 @@ def test_dkek(device): device.initialize(retries=DEFAULT_RETRIES, dkek_shares=DEFAULT_DKEK_SHARES) device.login(DEFAULT_PIN) resp = device.import_dkek(DEFAULT_DKEK) - assert(resp[0] == DEFAULT_DKEK_SHARES) - assert(resp[1] == DEFAULT_DKEK_SHARES-1) + assert('dkek' in resp) + assert('kcv' in resp) + assert(resp['dkek']['total'] == DEFAULT_DKEK_SHARES) + assert(resp['dkek']['missing'] == DEFAULT_DKEK_SHARES-1) resp = device.import_dkek(DEFAULT_DKEK) - assert(resp[1] == DEFAULT_DKEK_SHARES-2) + assert('dkek' in resp) + assert('kcv' in resp) + assert(resp['dkek']['total'] == DEFAULT_DKEK_SHARES) + assert(resp['dkek']['missing'] == DEFAULT_DKEK_SHARES-2) kcv = hashlib.sha256(b'\x00'*32).digest()[:8] - assert(resp[2:] == kcv) + assert(resp['kcv'] == kcv)