github/proxmark3
1
1
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2026-05-09 03:00:07 -04:00
Code Issues Packages Projects Releases Wiki Activity

added iso channel checks

Browse Source
This commit is contained in:
merlokk
2021-08-05 19:06:53 +03:00
parent 3609f8fb36
commit 3945e1e7f4
1 changed files with 48 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
client/src/mifare/desfiresecurechan.c
View File

@@ -41,6 +41,7 @@ static bool CommandCanUseAnyChannel(uint8_t cmd) {
}
static const AllowedChannelModesS AllowedChannelModes[] = {
// D40 channel
{MFDES_SELECT_APPLICATION, DACd40, DCCNative, DCMPlain},
{MFDES_CREATE_APPLICATION, DACd40, DCCNative, DCMMACed},
@@ -81,6 +82,7 @@ static const AllowedChannelModesS AllowedChannelModes[] = {
{MFDES_CHANGE_KEY, DACd40, DCCNative, DCMEncryptedPlain},
{MFDES_CHANGE_KEY_EV2, DACd40, DCCNative, DCMEncryptedPlain},
// EV1 and EV2 channel
{MFDES_SELECT_APPLICATION, DACEV1, DCCNative, DCMPlain},
{MFDES_GET_KEY_VERSION, DACEV1, DCCNative, DCMMACed},
@@ -114,8 +116,26 @@ static const AllowedChannelModesS AllowedChannelModes[] = {
{MFDES_CHANGE_KEY, DACEV1, DCCNative, DCMEncryptedPlain},
{MFDES_CHANGE_KEY_EV2, DACEV1, DCCNative, DCMEncryptedPlain},
// EV2 channel separately
{MFDES_AUTHENTICATE_EV2F, DACEV2, DCCNative, DCMPlain},
{MFDES_AUTHENTICATE_EV2NF, DACEV2, DCCNative, DCMPlain},
// ISO channel
{ISO7816_READ_BINARY, DACd40, DCCISO, DCMPlain},
{ISO7816_UPDATE_BINARY, DACd40, DCCISO, DCMPlain},
{ISO7816_READ_RECORDS, DACd40, DCCISO, DCMPlain},
{ISO7816_APPEND_RECORD, DACd40, DCCISO, DCMPlain},
{ISO7816_READ_BINARY, DACd40, DCCISO, DCMMACed},
{ISO7816_READ_RECORDS, DACd40, DCCISO, DCMMACed},
{ISO7816_READ_BINARY, DACEV1, DCCISO, DCMPlain},
{ISO7816_UPDATE_BINARY, DACEV1, DCCISO, DCMPlain},
{ISO7816_READ_RECORDS, DACEV1, DCCISO, DCMPlain},
{ISO7816_APPEND_RECORD, DACEV1, DCCISO, DCMPlain},
{ISO7816_READ_BINARY, DACEV1, DCCISO, DCMMACed},
{ISO7816_READ_RECORDS, DACEV1, DCCISO, DCMMACed},
};
#define CMD_HEADER_LEN_ALL 0xffff
@@ -186,6 +206,25 @@ static bool DesfireEV1D40ReceiveMAC(DesfireContext *ctx, uint8_t cmd) {
return false;
}
static const uint8_t ISOChannelValidCmd[] = {
ISO7816_SELECT_FILE,
ISO7816_READ_BINARY,
ISO7816_UPDATE_BINARY,
ISO7816_READ_RECORDS,
ISO7816_APPEND_RECORD,
ISO7816_GET_CHALLENGE,
ISO7816_EXTERNAL_AUTHENTICATION,
ISO7816_INTERNAL_AUTHENTICATION
};
static bool DesfireISOChannelValidCmd(uint8_t cmd) {
for (int i = 0; i < ARRAY_LENGTH(ISOChannelValidCmd); i++)
if (ISOChannelValidCmd[i] == cmd)
return true;
return false;
}
static void DesfireSecureChannelEncodeD40(DesfireContext *ctx, uint8_t cmd, uint8_t *srcdata, size_t srcdatalen, uint8_t *dstdata, size_t *dstdatalen) {
uint8_t data[1024] = {0};
size_t rlen = 0;
@@ -543,13 +582,21 @@ bool PrintChannelModeWarning(uint8_t cmd, DesfireSecureChannel secureChannel, De
PrintAndLogEx(WARNING, "Communication mode can't be NONE. command: %02x", cmd);
return false;
}
// no security set
if (secureChannel == DACNone)
return true;
if (CommandCanUseAnyChannel(cmd))
return true;
// ISO commands
if (cmdSet == DCCISO) {
bool res = DesfireISOChannelValidCmd(cmd);
if (!res)
return false;
}
bool found = false;
for (int i = 0; i < ARRAY_LENGTH(AllowedChannelModes); i++)
if (AllowedChannelModes[i].cmd == cmd) {