Merge branch 'master' into development-eddsa

Signed-off-by: Pol Henarejos <pol.henarejos@cttc.es>
This commit is contained in:
Pol Henarejos
2024-08-14 13:34:40 +02:00
51 changed files with 1345 additions and 1083 deletions

View File

@@ -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)

View File

@@ -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)

View File

@@ -31,7 +31,7 @@ def test_prepare_dkek(device):
resp = device.import_dkek(DEFAULT_DKEK)
resp = device.import_dkek(DEFAULT_DKEK)
kcv = hashlib.sha256(b'\x00'*32).digest()[:8]
assert(resp[2:] == kcv)
assert(resp['kcv'] == kcv)
@pytest.mark.parametrize(
"modulus", [1024, 2048, 4096]

View File

@@ -29,7 +29,7 @@ def test_prepare_dkek(device):
resp = device.import_dkek(DEFAULT_DKEK)
resp = device.import_dkek(DEFAULT_DKEK)
kcv = hashlib.sha256(b'\x00'*32).digest()[:8]
assert(resp[2:] == kcv)
assert(resp['kcv'] == kcv)
@pytest.mark.parametrize(
"curve", [ec.SECP192R1, ec.SECP256R1, ec.SECP384R1, ec.SECP521R1, ec.SECP256K1, ec.BrainpoolP256R1, ec.BrainpoolP384R1, ec.BrainpoolP512R1]