mirror of
https://github.com/RfidResearchGroup/proxmark3.git
synced 2025-01-31 04:20:28 +08:00
annotage desfire more
This commit is contained in:
parent
732c012be7
commit
0e2ac41717
2 changed files with 27 additions and 29 deletions
|
@ -709,7 +709,6 @@ void annotateMfDesfire(char *exp, size_t size, uint8_t *cmd, uint8_t cmdsize) {
|
|||
pos++;
|
||||
|
||||
for (uint8_t i = 0; i < 2; i++, pos++) {
|
||||
|
||||
switch (cmd[pos]) {
|
||||
case MFDES_CREATE_APPLICATION:
|
||||
snprintf(exp, size, "CREATE APPLICATION");
|
||||
|
@ -822,6 +821,9 @@ void annotateMfDesfire(char *exp, size_t size, uint8_t *cmd, uint8_t cmdsize) {
|
|||
case MFDES_ADDITIONAL_FRAME:
|
||||
snprintf(exp, size, "AUTH FRAME / NEXT FRAME");
|
||||
break;
|
||||
case MFDES_READSIG:
|
||||
snprintf(exp, size, "READ SIGNATURE");
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
|
|
|
@ -349,16 +349,12 @@ ISO 7816-4 Basic interindustry commands. For command APDU's.
|
|||
// 6x xx = ERROR
|
||||
|
||||
// MIFARE DESFire command set:
|
||||
|
||||
#define MFDES_GET_VERSION 0x60
|
||||
#define MFDES_AUTHENTICATE 0x0A // AUTHENTICATE_NATIVE
|
||||
#define MFDES_AUTHENTICATE_ISO 0x1A // AUTHENTICATE_STANDARD
|
||||
#define MFDES_AUTHENTICATE_AES 0xAA
|
||||
#define MFDES_CREATE_APPLICATION 0xCA
|
||||
#define MFDES_DELETE_APPLICATION 0xDA
|
||||
|
||||
#define MFDES_CREDIT 0x0C
|
||||
#define MFDES_LIMITED_CREDIT 0x1C
|
||||
#define MFDES_DEBIT 0xDC
|
||||
#define MFDES_WRITE_RECORD 0x3B
|
||||
#define MFDES_READSIG 0x3C
|
||||
#define MFDES_WRITE_DATA 0x3D
|
||||
|
@ -366,6 +362,7 @@ ISO 7816-4 Basic interindustry commands. For command APDU's.
|
|||
#define MFDES_CHANGE_KEY_SETTINGS 0x54
|
||||
#define MFDES_SELECT_APPLICATION 0x5A
|
||||
#define MFDES_CHANGE_FILE_SETTINGS 0x5F
|
||||
#define MFDES_GET_VERSION 0x60
|
||||
#define MFDES_GET_ISOFILE_IDS 0x61
|
||||
#define MFDES_GET_KEY_VERSION 0x64
|
||||
#define MFDES_GET_APPLICATION_IDS 0x6A
|
||||
|
@ -373,15 +370,32 @@ ISO 7816-4 Basic interindustry commands. For command APDU's.
|
|||
#define MFDES_GET_FREE_MEMORY 0x6E
|
||||
#define MFDES_GET_DF_NAMES 0x6D
|
||||
#define MFDES_GET_FILE_IDS 0x6F
|
||||
#define MFDES_ABORT_TRANSACTION 0xA7
|
||||
#define MFDES_ADDITIONAL_FRAME 0xAF
|
||||
#define MFDES_READ_RECORDS 0xBB
|
||||
#define MFDES_READ_DATA 0xBD
|
||||
#define MFDES_ABORT_TRANSACTION 0xA7
|
||||
#define MFDES_CREATE_CYCLIC_RECORD_FILE 0xC0
|
||||
#define MFDES_CREATE_LINEAR_RECORD_FILE 0xC1
|
||||
#define MFDES_CHANGE_KEY 0xC4
|
||||
#define MFDES_COMMIT_TRANSACTION 0xC7
|
||||
#define MFDES_CREATE_APPLICATION 0xCA
|
||||
#define MFDES_CREATE_BACKUP_DATA_FILE 0xCB
|
||||
#define MFDES_CREATE_VALUE_FILE 0xCC
|
||||
#define MFDES_CREATE_STD_DATA_FILE 0xCD
|
||||
#define MFDES_DELETE_APPLICATION 0xDA
|
||||
#define MFDES_DEBIT 0xDC
|
||||
#define MFDES_DELETE_FILE 0xDF
|
||||
#define MFDES_CLEAR_RECORD_FILE 0xEB
|
||||
#define MFDES_GET_FILE_SETTINGS 0xF5
|
||||
#define MFDES_FORMAT_PICC 0xFC
|
||||
|
||||
// MIFARE DESFire status set:
|
||||
|
||||
#define MFDES_OPERATION_OK 0x00
|
||||
#define MFDES_NO_CHANGES 0x0C
|
||||
#define MFDES_ADDITIONAL_FRAME 0xAF
|
||||
// MIFARE DESFire status & error codes:
|
||||
#define MFDES_S_OPERATION_OK 0x00
|
||||
#define MFDES_S_NO_CHANGES 0x0C
|
||||
#define MFDES_S_SIGNATURE 0x90
|
||||
#define MFDES_S_ADDITIONAL_FRAME 0xAF
|
||||
|
||||
#define MFDES_E_OUT_OF_EEPROM 0x0E
|
||||
#define MFDES_E_ILLEGAL_COMMAND_CODE 0x1C
|
||||
#define MFDES_E_INTEGRITY_ERROR 0x1E
|
||||
|
@ -401,26 +415,8 @@ ISO 7816-4 Basic interindustry commands. For command APDU's.
|
|||
#define MFDES_E_EEPROM 0xEE
|
||||
#define MFDES_E_FILE_NOT_FOUND 0xF0
|
||||
#define MFDES_E_FILE_INTEGRITY 0xF1
|
||||
#define MFDES_SIGNATURE 0x90
|
||||
|
||||
|
||||
#define MFDES_CREATE_CYCLIC_RECORD_FILE 0xC0
|
||||
#define MFDES_CREATE_LINEAR_RECORD_FILE 0xC1
|
||||
#define MFDES_CHANGE_KEY 0xC4
|
||||
#define MFDES_COMMIT_TRANSACTION 0xC7
|
||||
#define MFDES_CREATE_APPLICATION 0xCA
|
||||
#define MFDES_CREATE_BACKUP_DATA_FILE 0xCB
|
||||
#define MFDES_CREATE_VALUE_FILE 0xCC
|
||||
#define MFDES_CREATE_STD_DATA_FILE 0xCD
|
||||
|
||||
#define MFDES_CLEAR_RECORD_FILE 0xEB
|
||||
|
||||
#define MFDES_DELETE_APPLICATION 0xDA
|
||||
#define MFDES_DELETE_FILE 0xDF
|
||||
|
||||
#define MFDES_GET_FILE_SETTINGS 0xF5
|
||||
#define MFDES_FORMAT_PICC 0xFC
|
||||
|
||||
// LEGIC Commands
|
||||
#define LEGIC_MIM_22 0x0D
|
||||
#define LEGIC_MIM_256 0x1D
|
||||
|
|
Loading…
Reference in a new issue