crewID/libfreefare
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Return EACCES when authentication to a DESFire tag fails

Browse source 
Note that in case the tag didn't authenticate us, we've also
tag->last_picc_error = AUTHENTICATION_ERROR
But in the unlikely event that we didn't authenticate the tag
(e.g. if the tag is fake and pretends the auth was ok)
only errno = EACCES will be set
This commit is contained in:
Philippe Teuwen 2014-03-14 22:49:27 +01:00
parent c72a55993b
commit c4e657f8cd
1 changed files with 3 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
libfreefare/mifare_desfire.c
View file

@ -192,6 +192,8 @@ static ssize_t read_data (MifareTag tag, uint8_t command, uint8_t file_no, off_
res[__##res##_n-2] = __res[__##res##_n-1]; \ res[__##res##_n-2] = __res[__##res##_n-1]; \
__##res##_n--; \ __##res##_n--; \
if ((1 == __##res##_n) && (ADDITIONAL_FRAME != res[__##res##_n-1]) && (OPERATION_OK != res[__##res##_n-1])) { \ if ((1 == __##res##_n) && (ADDITIONAL_FRAME != res[__##res##_n-1]) && (OPERATION_OK != res[__##res##_n-1])) { \
if (res[0] == AUTHENTICATION_ERROR) \
errno = EACCES; \
return MIFARE_DESFIRE (tag)->last_picc_error = res[0], -1; \ return MIFARE_DESFIRE (tag)->last_picc_error = res[0], -1; \
} \ } \
memcpy (res, __res, __##res##_n - 1); \ memcpy (res, __res, __##res##_n - 1); \
@ -416,6 +418,7 @@ authenticate (MifareTag tag, uint8_t cmd, uint8_t key_no, MifareDESFireKey key)
hexdump (PCD_RndA_s, key_length, "PCD ", 0); hexdump (PCD_RndA_s, key_length, "PCD ", 0);
hexdump (PICC_RndA_s, key_length, "PICC ", 0); hexdump (PICC_RndA_s, key_length, "PICC ", 0);
#endif #endif
errno = EACCES;
return -1; return -1;
} }