github/RRG-Proxmark3
1
0
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2025-08-24 15:15:39 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

add AID for kdf

Browse source
This commit is contained in:
merlokk 2021-08-08 19:27:31 +03:00
commit 9e3cc6826c
3 changed files with 15 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

10
client/src/mifare/desfirecore.c
View file

@ -20,6 +20,7 @@
#include <string.h> #include <string.h>
#include <util.h> #include <util.h>
#include "commonutil.h" #include "commonutil.h"
#include "generator.h"
#include "aes.h" #include "aes.h"
#include "ui.h" #include "ui.h"
#include "crc.h" #include "crc.h"
@ -788,6 +789,7 @@ int DesfireSelectAID(DesfireContext *ctx, uint8_t *aid1, uint8_t *aid2) {
DesfireClearSession(ctx); DesfireClearSession(ctx);
ctx->appSelected = (aid1[0] != 0x00 || aid1[1] != 0x00 || aid1[2] != 0x00); ctx->appSelected = (aid1[0] != 0x00 || aid1[1] != 0x00 || aid1[2] != 0x00);
ctx->selectedAID = DesfireAIDByteToUint(aid1);
return PM3_SUCCESS; return PM3_SUCCESS;
} }
@ -825,6 +827,7 @@ int DesfireSelectAIDHexNoFieldOn(DesfireContext *ctx, uint32_t aid) {
DesfireClearSession(ctx); DesfireClearSession(ctx);
ctx->appSelected = (aid != 0x000000); ctx->appSelected = (aid != 0x000000);
ctx->selectedAID = aid;
return PM3_SUCCESS; return PM3_SUCCESS;
} }
@ -991,13 +994,13 @@ static int DesfireAuthenticateEV1(DesfireContext *dctx, DesfireSecureChannel sec
// We will overrite any provided KDF input since a gallagher specific KDF was requested. // We will overrite any provided KDF input since a gallagher specific KDF was requested.
dctx->kdfInputLen = 11; dctx->kdfInputLen = 11;
/*if (mfdes_kdf_input_gallagher(tag->info.uid, tag->info.uidlen, dctx->keyNum, tag->selected_application, dctx->kdfInput, &dctx->kdfInputLen) != PM3_SUCCESS) { if (mfdes_kdf_input_gallagher(dctx->uid, dctx->uidlen, dctx->keyNum, dctx->selectedAID, dctx->kdfInput, &dctx->kdfInputLen) != PM3_SUCCESS) {
PrintAndLogEx(FAILED, "Could not generate Gallagher KDF input"); PrintAndLogEx(FAILED, "Could not generate Gallagher KDF input");
}*/ }
PrintAndLogEx(INFO, " KDF Input: " _YELLOW_("%s"), sprint_hex(dctx->kdfInput, dctx->kdfInputLen));
MifareKdfAn10922(dctx, DCOMasterKey, dctx->kdfInput, dctx->kdfInputLen); MifareKdfAn10922(dctx, DCOMasterKey, dctx->kdfInput, dctx->kdfInputLen);
PrintAndLogEx(INFO, " Derrived key: " _GREEN_("%s"), sprint_hex(dctx->key, desfire_get_key_block_length(dctx->keyType))); PrintAndLogEx(INFO, " Derrived key: " _GREEN_("%s"), sprint_hex(dctx->key, desfire_get_key_block_length(dctx->keyType)));
PrintAndLogEx(INFO, " KDF Input: " _YELLOW_("%s"), sprint_hex(dctx->kdfInput, dctx->kdfInputLen));
} }
uint8_t subcommand = MFDES_AUTHENTICATE; uint8_t subcommand = MFDES_AUTHENTICATE;
@ -2547,6 +2550,7 @@ int DesfireISOSelectEx(DesfireContext *dctx, bool fieldon, DesfireISOSelectContr
DesfireClearSession(dctx); DesfireClearSession(dctx);
dctx->appSelected = !((cntr == ISSMFDFEF && datalen == 0) || (cntr == ISSEFByFileID && datalen == 2 && data[0] == 0 && data[1] == 0)); dctx->appSelected = !((cntr == ISSMFDFEF && datalen == 0) || (cntr == ISSEFByFileID && datalen == 2 && data[0] == 0 && data[1] == 0));
dctx->selectedAID = 0;
return res; return res;
} }

4
client/src/mifare/desfirecrypto.c
View file

@ -43,6 +43,10 @@ void DesfireClearContext(DesfireContext *ctx) {
ctx->commMode = DCMNone; ctx->commMode = DCMNone;
ctx->appSelected = false; ctx->appSelected = false;
ctx->selectedAID = 0;
memset(ctx->uid, 0, sizeof(ctx->uid));
ctx->uidlen = 0;
ctx->kdfAlgo = 0; ctx->kdfAlgo = 0;
ctx->kdfInputLen = 0; ctx->kdfInputLen = 0;

4
client/src/mifare/desfirecrypto.h
View file

@ -87,6 +87,10 @@ typedef struct DesfireContextS {
DesfireCommunicationMode commMode; // plain/mac/enc DesfireCommunicationMode commMode; // plain/mac/enc
bool appSelected; // for iso auth bool appSelected; // for iso auth
uint32_t selectedAID;
uint8_t uid[10];
uint8_t uidlen;
uint8_t IV[DESFIRE_MAX_KEY_SIZE]; uint8_t IV[DESFIRE_MAX_KEY_SIZE];
uint8_t sessionKeyMAC[DESFIRE_MAX_KEY_SIZE]; uint8_t sessionKeyMAC[DESFIRE_MAX_KEY_SIZE];