Merge pull request #196 from solokeys/fido2-conformance

Fido2 conformance
This commit is contained in:
Conor Patrick 2019-05-19 12:24:36 -04:00 committed by GitHub
commit 5f878ff022
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 26 additions and 1 deletions

Binary file not shown.

After

Width:  |  Height:  |  Size: 134 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 129 KiB

View File

@ -929,7 +929,15 @@ uint8_t parse_credential_descriptor(CborValue * arr, CTAP_credentialDescriptor *
buflen = sizeof(type); buflen = sizeof(type);
ret = cbor_value_copy_text_string(&val, type, &buflen, NULL); ret = cbor_value_copy_text_string(&val, type, &buflen, NULL);
if (ret == CborErrorOutOfMemory)
{
cred->type = PUB_KEY_CRED_UNKNOWN;
}
else
{
check_ret(ret); check_ret(ret);
}
if (strncmp(type, "public-key",11) == 0) if (strncmp(type, "public-key",11) == 0)
{ {

View File

@ -20,6 +20,9 @@
], ],
"userVerificationDetails": [ "userVerificationDetails": [
[ [
{
"userVerification": 1
},
{ {
"userVerification": 4 "userVerification": 4
} }

View File

@ -621,6 +621,20 @@ class FIDO2Tests(Tester):
other={"exclude_list": [{"id": b"1234", "type": "rot13"}]}, other={"exclude_list": [{"id": b"1234", "type": "rot13"}]},
) )
self.testMC(
"Send MC request with excludeList item with bogus type, expect SUCCESS",
cdh,
rp,
user,
key_params,
expectedError=CtapError.ERR.SUCCESS,
other={
"exclude_list": [
{"id": b"1234", "type": "mangoPapayaCoconutNotAPublicKey"}
]
},
)
self.testMC( self.testMC(
"Send MC request with excludeList with bad item, expect error", "Send MC request with excludeList with bad item, expect error",
cdh, cdh,