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

Fix get assertion.

Browse Source 
Credentials must be sorted in descending order.

Signed-off-by: Pol Henarejos <pol.henarejos@cttc.es>
This commit is contained in:
Pol Henarejos
2022-09-22 09:30:13 +02:00
parent 226fcc5405
commit 3b25eb295c
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/fido/cbor_get_assertion.c
View File

@@ -40,7 +40,6 @@ size_t lenx = 0;
int cbor_get_next_assertion(const uint8_t *data, size_t len) { int cbor_get_next_assertion(const uint8_t *data, size_t len) {
CborError error = CborNoError; CborError error = CborNoError;
printf("%d %d %ld %ld\n", credentialCounter, numberOfCredentialsx, timerx, board_millis());
if (credentialCounter >= numberOfCredentialsx) if (credentialCounter >= numberOfCredentialsx)
CBOR_ERROR(CTAP2_ERR_NOT_ALLOWED); CBOR_ERROR(CTAP2_ERR_NOT_ALLOWED);
if (timerx+30*1000 < board_millis()) if (timerx+30*1000 < board_millis())
@@ -286,10 +285,19 @@ int cbor_get_assertion(const uint8_t *data, size_t len, bool next) {
creds[numberOfCredentials++] = creds[i]; creds[numberOfCredentials++] = creds[i];
} }
} }
printf("!! %d %d %d\n", numberOfCredentials, creds_len, allowList_len);
if (numberOfCredentials == 0) if (numberOfCredentials == 0)
CBOR_ERROR(CTAP2_ERR_NO_CREDENTIALS); CBOR_ERROR(CTAP2_ERR_NO_CREDENTIALS);
for (int i = 0; i < numberOfCredentials; i++) {
for (int j = i + 1; j < numberOfCredentials; j++) {
if (creds[j].creation > creds[i].creation) {
Credential tmp = creds[j];
creds[j] = creds[i];
creds[i] = tmp;
}
}
}
if (options.up == ptrue || options.present == false || options.up == NULL) { //9.1 if (options.up == ptrue || options.present == false || options.up == NULL) { //9.1
if (pinUvAuthParam.present == true) { if (pinUvAuthParam.present == true) {
if (getUserPresentFlagValue() == false) { if (getUserPresentFlagValue() == false) {
@@ -302,8 +310,6 @@ int cbor_get_assertion(const uint8_t *data, size_t len, bool next) {
clearUserVerifiedFlag(); clearUserVerifiedFlag();
clearPinUvAuthTokenPermissionsExceptLbw(); clearPinUvAuthTokenPermissionsExceptLbw();
} }
if (numberOfCredentials == 0)
CBOR_ERROR(CTAP2_ERR_NO_CREDENTIALS);
if (!(flags & FIDO2_AUT_FLAG_UP) && !(flags & FIDO2_AUT_FLAG_UV)) { if (!(flags & FIDO2_AUT_FLAG_UP) && !(flags & FIDO2_AUT_FLAG_UV)) {
selcred = &creds[0]; selcred = &creds[0];