dearsky/pico-fido
1
0
Fork 0
Code Issues 46 Pull Requests 1 Actions Packages Projects Releases 22 Wiki Activity

Merge branch 'development' into eddsa

Browse Source
This commit is contained in:
Pol Henarejos
2023-08-18 13:07:13 +02:00
parent 8242dc8d80 26148282e6
commit b9ad8f4745
2 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/fido/fido.c
View File

@@ -274,6 +274,9 @@ int derive_key(const uint8_t *app_id,
if (cinfo == NULL) { if (cinfo == NULL) {
return 1; return 1;
} }
if (cinfo->bit_size % 8 != 0) {
outk[0] >>= 8 - (cinfo->bit_size % 8);
}
r = mbedtls_ecp_read_key(curve, key, outk, ceil((float) cinfo->bit_size / 8)); r = mbedtls_ecp_read_key(curve, key, outk, ceil((float) cinfo->bit_size / 8));
mbedtls_platform_zeroize(outk, sizeof(outk)); mbedtls_platform_zeroize(outk, sizeof(outk));
if (r != 0) { if (r != 0) {

11
tests/pico-fido/test_020_register.py
View File

@@ -19,7 +19,7 @@
from fido2.client import CtapError from fido2.client import CtapError
from fido2.cose import ES256 from fido2.cose import ES256, ES384, ES512, EdDSA
import pytest import pytest
@@ -31,7 +31,7 @@ def test_make_credential():
pass pass
def test_attestation_format(MCRes): def test_attestation_format(MCRes):
assert MCRes['res'].attestation_object.fmt in ["packed", "tpm", "android-key", "adroid-safetynet"] assert MCRes['res'].attestation_object.fmt in ["packed", "tpm", "android-key", "adroid-safetynet"]
def test_authdata_length(MCRes): def test_authdata_length(MCRes):
assert len(MCRes['res'].attestation_object.auth_data) >= 77 assert len(MCRes['res'].attestation_object.auth_data) >= 77
@@ -120,6 +120,13 @@ def test_bad_type_pubKeyCredParams(device):
with pytest.raises(CtapError) as e: with pytest.raises(CtapError) as e:
device.doMC(key_params=["wrong"]) device.doMC(key_params=["wrong"])
@pytest.mark.parametrize(
"alg", [ES256.ALGORITHM, ES384.ALGORITHM, ES512.ALGORITHM]
)
def test_algorithms(device, info, alg):
if ({'alg': alg, 'type': 'public-key'} in info.algorithms):
device.doMC(key_params=[{"alg": alg, "type": "public-key"}])
def test_missing_pubKeyCredParams_type(device): def test_missing_pubKeyCredParams_type(device):
with pytest.raises(CtapError) as e: with pytest.raises(CtapError) as e:
device.doMC(key_params=[{"alg": ES256.ALGORITHM}]) device.doMC(key_params=[{"alg": ES256.ALGORITHM}])