Fix MAD manipulation for Mifare Classic 4K.

- Allocate large blocks on Mifare Classic 4K in unit tests;
  - Constraints sector number in mad_set_aid();
  - Fix location of AID storage in mad_set_aid() (wrong variable name and offset, ECOPYPASTETOOFAST);
  - New API function mad_sector_reserved();
  - Use mad_sector_reserved() to avoid trying to use reserved sectors.
This commit is contained in:
Romain Tartiere 2010-07-01 21:44:40 +00:00
parent 541292505a
commit f83918ee41
5 changed files with 36 additions and 4 deletions

View file

@ -36,12 +36,34 @@ test_mifare_classic_application (void)
cut_assert_not_null (s_found, cut_message ("mifare_application_alloc() failed"));
for (int i = 0; i < 3; i++) {
cut_assert_equal_int (s_alloc[i], s_found[i], cut_message ("Allocated and found blocks don't match"));
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"));
mifare_application_free (mad, aid);
free (s_alloc);
free (s_found);
s_found = mifare_application_find (mad, aid);
cut_assert_null (s_found, cut_message ("mifare_application_free() failed"));
s_alloc = mifare_application_alloc (mad, aid, 15*16 + 1*16 + 1);
cut_assert_not_null (s_alloc, cut_message ("mifare_application_alloc() failed"));
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++) {
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"));
mifare_application_free (mad, aid);
free (s_alloc);