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

Enhance communication settings detection failures detection.

Browse source
This commit is contained in:
Romain Tartiere 2010-08-31 10:06:55 +00:00
parent 2fc0d76044
commit f7c4d99868
1 changed files with 20 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
libfreefare/mifare_desfire.c
View file

@ -91,6 +91,20 @@ static ssize_t read_data (MifareTag tag, uint8_t command, uint8_t file_no, off_
return errno = EINVAL, -1;\ return errno = EINVAL, -1;\
} while (0); } while (0);
/*
* XXX: cs < 0 is a CommunicationSettings detection error. Other values are
* user erros. We may need to distinguish them.
*/
#define ASSERT_CS(cs) \
do { \
if (cs < 0) \
return errno = EINVAL, -1; \
if (cs == 0x02) \
return errno = EINVAL, -1; \
if (cs > 0x03) \
return errno = EINVAL, -1; \
} while (0)
#define ASSERT_NOT_NULL(argument) \ #define ASSERT_NOT_NULL(argument) \
do { \ do { \
if (!argument) \ if (!argument) \
@ -152,7 +166,6 @@ static int32_t le24toh (uint8_t data[3]);
int int
madame_soleil_get_read_communication_settings (MifareTag tag, uint8_t file_no) madame_soleil_get_read_communication_settings (MifareTag tag, uint8_t file_no)
{ {
// FIXME: It might be forbiden to get file settings.
struct mifare_desfire_file_settings settings; struct mifare_desfire_file_settings settings;
if (mifare_desfire_get_file_settings (tag, file_no, &settings)) if (mifare_desfire_get_file_settings (tag, file_no, &settings))
return -1; return -1;
@ -167,7 +180,6 @@ madame_soleil_get_read_communication_settings (MifareTag tag, uint8_t file_no)
int int
madame_soleil_get_write_communication_settings (MifareTag tag, uint8_t file_no) madame_soleil_get_write_communication_settings (MifareTag tag, uint8_t file_no)
{ {
// FIXME: It might be forbiden to get file settings.
struct mifare_desfire_file_settings settings; struct mifare_desfire_file_settings settings;
if (mifare_desfire_get_file_settings (tag, file_no, &settings)) if (mifare_desfire_get_file_settings (tag, file_no, &settings))
return -1; return -1;
@ -877,6 +889,7 @@ read_data (MifareTag tag, uint8_t command, uint8_t file_no, off_t offset, size_t
ASSERT_ACTIVE (tag); ASSERT_ACTIVE (tag);
ASSERT_MIFARE_DESFIRE (tag); ASSERT_MIFARE_DESFIRE (tag);
ASSERT_CS (cs);
BUFFER_INIT (cmd, 8); BUFFER_INIT (cmd, 8);
BUFFER_INIT (res, MAX_FRAME_SIZE); BUFFER_INIT (res, MAX_FRAME_SIZE);
@ -943,6 +956,7 @@ write_data (MifareTag tag, uint8_t command, uint8_t file_no, off_t offset, size_
ASSERT_ACTIVE (tag); ASSERT_ACTIVE (tag);
ASSERT_MIFARE_DESFIRE (tag); ASSERT_MIFARE_DESFIRE (tag);
ASSERT_CS (cs);
BUFFER_INIT (cmd, MAX_FRAME_SIZE); BUFFER_INIT (cmd, MAX_FRAME_SIZE);
BUFFER_INIT (res, 1); BUFFER_INIT (res, 1);
@ -1010,6 +1024,7 @@ mifare_desfire_get_value_ex (MifareTag tag, uint8_t file_no, int32_t *value, int
ASSERT_ACTIVE (tag); ASSERT_ACTIVE (tag);
ASSERT_MIFARE_DESFIRE (tag); ASSERT_MIFARE_DESFIRE (tag);
ASSERT_CS (cs);
BUFFER_INIT (cmd, 2); BUFFER_INIT (cmd, 2);
BUFFER_INIT (res, 9); BUFFER_INIT (res, 9);
@ -1046,6 +1061,7 @@ mifare_desfire_credit_ex (MifareTag tag, uint8_t file_no, int32_t amount, int cs
{ {
ASSERT_ACTIVE (tag); ASSERT_ACTIVE (tag);
ASSERT_MIFARE_DESFIRE (tag); ASSERT_MIFARE_DESFIRE (tag);
ASSERT_CS (cs);
BUFFER_INIT (cmd, 10); BUFFER_INIT (cmd, 10);
BUFFER_INIT (res, 1); BUFFER_INIT (res, 1);
@ -1074,6 +1090,7 @@ mifare_desfire_debit_ex (MifareTag tag, uint8_t file_no, int32_t amount, int cs)
{ {
ASSERT_ACTIVE (tag); ASSERT_ACTIVE (tag);
ASSERT_MIFARE_DESFIRE (tag); ASSERT_MIFARE_DESFIRE (tag);
ASSERT_CS (cs);
BUFFER_INIT (cmd, 10); BUFFER_INIT (cmd, 10);
BUFFER_INIT (res, 1); BUFFER_INIT (res, 1);
@ -1102,6 +1119,7 @@ mifare_desfire_limited_credit_ex (MifareTag tag, uint8_t file_no, int32_t amount
{ {
ASSERT_ACTIVE (tag); ASSERT_ACTIVE (tag);
ASSERT_MIFARE_DESFIRE (tag); ASSERT_MIFARE_DESFIRE (tag);
ASSERT_CS (cs);
BUFFER_INIT (cmd, 10); BUFFER_INIT (cmd, 10);
BUFFER_INIT (res, 1); BUFFER_INIT (res, 1);