Merge the freefare-desfire branch into trunk.
This commit is contained in:
parent
3f6a142b57
commit
5779d6f945
38 changed files with 4943 additions and 116 deletions
|
|
@ -27,6 +27,9 @@ test_mifare_application (void)
|
|||
|
||||
MadAid aid = { 0x22, 0x42 };
|
||||
Mad mad = mad_new (2);
|
||||
|
||||
int i;
|
||||
|
||||
cut_assert_not_null (mad, cut_message ("mad_new() failed"));
|
||||
|
||||
MifareClassicSectorNumber *s_alloc = mifare_application_alloc (mad, aid, 3*3*16);
|
||||
|
|
@ -35,12 +38,12 @@ test_mifare_application (void)
|
|||
MifareClassicSectorNumber *s_found = mifare_application_find (mad, aid);
|
||||
cut_assert_not_null (s_found, cut_message ("mifare_application_alloc() failed"));
|
||||
|
||||
for (int i = 0; i < 3; i++) {
|
||||
for (i = 0; s_alloc[i]; i++) {
|
||||
cut_assert_equal_int (s_alloc[i], s_found[i], cut_message ("Allocated and found blocks don't match at position %d", i));
|
||||
}
|
||||
|
||||
cut_assert_equal_int (0, s_alloc[3], cut_message ("Invalid size"));
|
||||
cut_assert_equal_int (0, s_found[3], cut_message ("Invalid size"));
|
||||
cut_assert_equal_int (0, s_alloc[i], cut_message ("Invalid size"));
|
||||
cut_assert_equal_int (0, s_found[i], cut_message ("Invalid size"));
|
||||
|
||||
mifare_application_free (mad, aid);
|
||||
|
||||
|
|
@ -56,12 +59,14 @@ test_mifare_application (void)
|
|||
s_found = mifare_application_find (mad, aid);
|
||||
cut_assert_not_null (s_found, cut_message ("mifare_application_alloc() failed"));
|
||||
|
||||
for (int i = 0; i < 3; i++) {
|
||||
|
||||
|
||||
for (i = 0; s_alloc[i]; i++) {
|
||||
cut_assert_equal_int (s_alloc[i], s_found[i], cut_message ("Allocated and found blocks don't match at position %d", i));
|
||||
}
|
||||
|
||||
cut_assert_equal_int (0, s_alloc[3], cut_message ("Invalid size"));
|
||||
cut_assert_equal_int (0, s_found[3], cut_message ("Invalid size"));
|
||||
cut_assert_equal_int (0, s_alloc[i], cut_message ("Invalid size"));
|
||||
cut_assert_equal_int (0, s_found[i], cut_message ("Invalid size"));
|
||||
|
||||
|
||||
mifare_application_free (mad, aid);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue