shimun/solo
1
0
Fork 0
Code Issues Pull Requests Releases 1 Wiki Activity

use error code PIN_AUTH_INVALID

Browse Source
This commit is contained in:
Conor Patrick 2019-07-28 21:41:11 -04:00
parent 2af747ddaa
commit b47854c335
2 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
fido2/ctap.c
View File

@ -704,7 +704,7 @@ uint8_t ctap_make_credential(CborEncoder * encoder, uint8_t * request, int lengt
{ {
return CTAP2_ERR_OPERATION_DENIED; return CTAP2_ERR_OPERATION_DENIED;
} }
return ctap_is_pin_set() == 1 ? CTAP2_ERR_PIN_INVALID : CTAP2_ERR_PIN_NOT_SET; return ctap_is_pin_set() == 1 ? CTAP2_ERR_PIN_AUTH_INVALID : CTAP2_ERR_PIN_NOT_SET;
} }
if ((MC.paramsParsed & MC_requiredMask) != MC_requiredMask) if ((MC.paramsParsed & MC_requiredMask) != MC_requiredMask)
{ {
@ -1140,7 +1140,7 @@ uint8_t ctap_get_assertion(CborEncoder * encoder, uint8_t * request, int length)
{ {
return CTAP2_ERR_OPERATION_DENIED; return CTAP2_ERR_OPERATION_DENIED;
} }
return ctap_is_pin_set() == 1 ? CTAP2_ERR_PIN_INVALID : CTAP2_ERR_PIN_NOT_SET; return ctap_is_pin_set() == 1 ? CTAP2_ERR_PIN_AUTH_INVALID : CTAP2_ERR_PIN_NOT_SET;
} }
if (GA.pinAuthPresent) if (GA.pinAuthPresent)
{ {

26
tools/testing/tests/fido2.py
View File

@ -1134,7 +1134,10 @@ class FIDO2Tests(Tester):
rp["id"], rp["id"],
cdh, cdh,
other={"pin_auth": b"", "pin_protocol": pin_protocol}, other={"pin_auth": b"", "pin_protocol": pin_protocol},
expectedError=CtapError.ERR.PIN_NOT_SET, expectedError=[
CtapError.ERR.PIN_AUTH_INVALID,
CtapError.ERR.NO_CREDENTIALS,
],
) )
with Test("Setting pin code, expect SUCCESS"): with Test("Setting pin code, expect SUCCESS"):
@ -1148,14 +1151,17 @@ class FIDO2Tests(Tester):
user, user,
key_params, key_params,
other={"pin_auth": b"", "pin_protocol": pin_protocol}, other={"pin_auth": b"", "pin_protocol": pin_protocol},
expectedError=CtapError.ERR.PIN_INVALID, expectedError=CtapError.ERR.PIN_AUTH_INVALID,
) )
self.testGA( self.testGA(
"Send MC request with new pin auth", "Send MC request with new pin auth",
rp["id"], rp["id"],
cdh, cdh,
other={"pin_auth": b"", "pin_protocol": pin_protocol}, other={"pin_auth": b"", "pin_protocol": pin_protocol},
expectedError=CtapError.ERR.PIN_INVALID, expectedError=[
CtapError.ERR.PIN_AUTH_INVALID,
CtapError.ERR.NO_CREDENTIALS,
],
) )
self.testReset() self.testReset()
@ -1311,13 +1317,13 @@ class FIDO2Tests(Tester):
self.testReset() self.testReset()
self.test_get_info() # self.test_get_info()
#
self.test_get_assertion() # self.test_get_assertion()
#
self.test_make_credential() # self.test_make_credential()
#
self.test_rk(None) # self.test_rk(None)
self.test_client_pin() self.test_client_pin()