This commit is contained in:
Philippe Teuwen 2019-04-29 22:41:28 +02:00
commit 56f92348ea
8 changed files with 58 additions and 58 deletions

View file

@ -697,34 +697,34 @@ static int ndef_print_CC(uint8_t *data) {
uint8_t minor = (data[1] & 0x30) >> 4;
uint8_t major = (data[1] & 0xC0) >> 6;
char wStr[50];
switch ( write ) {
case 0:
sprintf(wStr, "Write access granted without any security");
break;
case 1:
sprintf(wStr, "RFU");
break;
case 2:
sprintf(wStr, "Proprietary");
break;
case 3:
sprintf(wStr, "No write access");
break;
}
char rStr[46];
switch ( read ) {
case 0:
sprintf(rStr, "Read access granted without any security");
break;
case 1:
case 3:
sprintf(rStr, "RFU");
break;
case 2:
sprintf(rStr, "Proprietary");
break;
}
char wStr[50];
switch (write) {
case 0:
sprintf(wStr, "Write access granted without any security");
break;
case 1:
sprintf(wStr, "RFU");
break;
case 2:
sprintf(wStr, "Proprietary");
break;
case 3:
sprintf(wStr, "No write access");
break;
}
char rStr[46];
switch (read) {
case 0:
sprintf(rStr, "Read access granted without any security");
break;
case 1:
case 3:
sprintf(rStr, "RFU");
break;
case 2:
sprintf(rStr, "Proprietary");
break;
}
PrintAndLogEx(NORMAL, "--- NDEF Message");
@ -734,7 +734,7 @@ static int ndef_print_CC(uint8_t *data) {
// PrintAndLogEx(NORMAL, " %02X : version %d.%d supported by tag", data[1], (data[1] & 0xF0) >> 4, data[1] & 0x0F);
PrintAndLogEx(NORMAL, " %02X : version %d.%d supported by tag", data[1], major, minor);
PrintAndLogEx(NORMAL, " : %s / %s", rStr, wStr);
PrintAndLogEx(NORMAL, " %02X : Physical Memory Size: %d bytes", data[2], data[2] * 8);
if (data[2] == 0x96)
PrintAndLogEx(NORMAL, " %02X : NDEF Memory Size: %d bytes", data[2], 48);
@ -749,11 +749,11 @@ static int ndef_print_CC(uint8_t *data) {
uint8_t sf = (data[3] & 0x10) >> 4;
uint8_t lb = (data[3] & 0x08) >> 3;
uint8_t mlrule = (data[3] & 0x06) >> 1;
uint8_t mbread = (data[3] & 0x01);
uint8_t mbread = (data[3] & 0x01);
PrintAndLogEx(NORMAL, " Additional feature information");
PrintAndLogEx(NORMAL, " %02X", data[3]);
PrintAndLogEx(NORMAL, " 00000000");
PrintAndLogEx(NORMAL, " 00000000");
PrintAndLogEx(NORMAL, " xxx - %02X : RFU (%s)", msb3, (msb3 == 0) ? _GREEN_("OK") : _RED_("Fail"));
PrintAndLogEx(NORMAL, " x - %02X : %s special frame", sf, (sf) ? "support" : "don\'t support");
PrintAndLogEx(NORMAL, " x - %02X : %s lock block", lb, (lb) ? "support" : "don\'t support");