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

Fix MadAid field orders (transfer bytes order is big endian).

Browse source
This commit is contained in:
Romain Tartiere 2010-01-08 22:44:33 +00:00
parent 3e00c7899a
commit 7a68e0f6ce
2 changed files with 25 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
libfreefare/freefare.h
View file

@ -79,8 +79,8 @@ void mifare_classic_trailer_block (MifareClassicBlock *block, const MifareClas
#define MCAB_WRITE_KEYB 0x001
struct mad_aid {
uint8_t function_cluster_code;
uint8_t application_code;
uint8_t function_cluster_code;
};
typedef struct mad_aid MadAid;

29
test/test_mad.c
View file

@ -268,7 +268,7 @@ DEFINE_TEST (test_mad_sector_0x00_crc8)
res = mad_set_card_publisher_sector (mad, 0x01);
/* Block 1 */
MadAid aid1 = { 0x08, 0x01 };
MadAid aid1 = { 0x01, 0x08 };
mad_set_aid (mad, 1, aid1);
mad_set_aid (mad, 2, aid1);
mad_set_aid (mad, 3, aid1);
@ -278,21 +278,21 @@ DEFINE_TEST (test_mad_sector_0x00_crc8)
mad_set_aid (mad, 4, empty_aid);
mad_set_aid (mad, 5, empty_aid);
mad_set_aid (mad, 6, empty_aid);
MadAid aid2 = { 0x00, 0x04 };
MadAid aid2 = { 0x04, 0x00 };
mad_set_aid (mad, 7, aid2);
/* Block 3 */
MadAid aid3 = { 0x10, 0x03 };
MadAid aid3 = { 0x03, 0x10 };
mad_set_aid (mad, 8, aid3);
mad_set_aid (mad, 9, aid3);
MadAid aid4 = { 0x10, 0x02 };
MadAid aid4 = { 0x02, 0x10 };
mad_set_aid (mad, 10, aid4);
mad_set_aid (mad, 11, aid4);
mad_set_aid (mad, 12, empty_aid);
mad_set_aid (mad, 13, empty_aid);
mad_set_aid (mad, 14, empty_aid);
MadAid aid5 = { 0x30, 0x11 };
MadAid aid5 = { 0x11, 0x30 };
mad_set_aid (mad, 15, aid5);
res = sector_0x00_crc8 (mad);
@ -303,3 +303,22 @@ DEFINE_TEST (test_mad_sector_0x00_crc8)
} while (0);
}
DEFINE_TEST (test_mad_read)
{
int res;
MifareClassicTag tag;
do
{
res = mifare_classic_test_setup (&tag);
assertEqualInt (res, 0);
Mad mad = mad_read (tag);
if (!mad) {
assertEqualInt (0, 1);
}
} while (0);
mifare_classic_test_teardown (tag);
}