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

text

Browse source
This commit is contained in:
iceman1001 2025-06-08 16:10:26 +02:00
commit 3d8a15d361
4 changed files with 13 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

9
client/src/cmdhfmfdes.c
View file

@ -817,7 +817,7 @@ static int CmdHF14ADesInfo(const char *Cmd) {
if (aidbuflen > 2) { if (aidbuflen > 2) {
uint8_t j = aidbuflen / 3; uint8_t j = (aidbuflen / 3);
PrintAndLogEx(NORMAL, ""); PrintAndLogEx(NORMAL, "");
PrintAndLogEx(SUCCESS, "--- " _CYAN_("AID list") " ( " _YELLOW_("%u") " found )", j); PrintAndLogEx(SUCCESS, "--- " _CYAN_("AID list") " ( " _YELLOW_("%u") " found )", j);
@ -826,6 +826,7 @@ static int CmdHF14ADesInfo(const char *Cmd) {
uint32_t aid = DesfireAIDByteToUint(&aidbuf[i]); uint32_t aid = DesfireAIDByteToUint(&aidbuf[i]);
PrintAndLogEx(SUCCESS, _YELLOW_("%06X") ", %s", aid, getAidCommentStr(aid)); PrintAndLogEx(SUCCESS, _YELLOW_("%06X") ", %s", aid, getAidCommentStr(aid));
} }
PrintAndLogEx(NORMAL, "");
} }
DesfireFillPICCInfo(&dctx, &PICCInfo, true); DesfireFillPICCInfo(&dctx, &PICCInfo, true);
@ -3285,11 +3286,15 @@ static int CmdHF14ADesGetAIDs(const char *Cmd) {
} }
if (buflen >= 3) { if (buflen >= 3) {
PrintAndLogEx(INFO, "---- " _CYAN_("AID list") " ----");
uint8_t j = (buflen / 3);
PrintAndLogEx(NORMAL, "");
PrintAndLogEx(SUCCESS, "--- " _CYAN_("AID list") " ( " _YELLOW_("%u") " found )", j);
for (int i = 0; i < buflen; i += 3) { for (int i = 0; i < buflen; i += 3) {
uint32_t aid = DesfireAIDByteToUint(&buf[i]); uint32_t aid = DesfireAIDByteToUint(&buf[i]);
PrintAndLogEx(SUCCESS, _YELLOW_("%06X") " %s", aid, getAidCommentStr(aid)); PrintAndLogEx(SUCCESS, _YELLOW_("%06X") " %s", aid, getAidCommentStr(aid));
} }
PrintAndLogEx(NORMAL, "");
} else { } else {
PrintAndLogEx(INFO, "There is no applications on the card"); PrintAndLogEx(INFO, "There is no applications on the card");
} }

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

@ -106,6 +106,10 @@ void DesfireSetKdf(DesfireContext_t *ctx, uint8_t kdfAlgo, uint8_t *kdfInput, ui
} }
} }
void DesfireSetSecureChannel(DesfireContext_t *ctx, DesfireSecureChannel schann) {
ctx->secureChannel = schann;
}
bool DesfireIsAuthenticated(DesfireContext_t *dctx) { bool DesfireIsAuthenticated(DesfireContext_t *dctx) {
return dctx->secureChannel != DACNone; return dctx->secureChannel != DACNone;
} }

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

@ -95,6 +95,7 @@ void DesfireSetKey(DesfireContext_t *ctx, uint8_t keyNum, DesfireCryptoAlgorithm
void DesfireSetKeyNoClear(DesfireContext_t *ctx, uint8_t keyNum, DesfireCryptoAlgorithm keyType, uint8_t *key); void DesfireSetKeyNoClear(DesfireContext_t *ctx, uint8_t keyNum, DesfireCryptoAlgorithm keyType, uint8_t *key);
void DesfireSetCommandSet(DesfireContext_t *ctx, DesfireCommandSet cmdSet); void DesfireSetCommandSet(DesfireContext_t *ctx, DesfireCommandSet cmdSet);
void DesfireSetCommMode(DesfireContext_t *ctx, DesfireCommunicationMode commMode); void DesfireSetCommMode(DesfireContext_t *ctx, DesfireCommunicationMode commMode);
void DesfireSetSecureChannel(DesfireContext_t *ctx, DesfireSecureChannel schann);
void DesfireSetKdf(DesfireContext_t *ctx, uint8_t kdfAlgo, uint8_t *kdfInput, uint8_t kdfInputLen); void DesfireSetKdf(DesfireContext_t *ctx, uint8_t kdfAlgo, uint8_t *kdfInput, uint8_t kdfInputLen);
bool DesfireIsAuthenticated(DesfireContext_t *dctx); bool DesfireIsAuthenticated(DesfireContext_t *dctx);
size_t DesfireGetMACLength(DesfireContext_t *ctx); size_t DesfireGetMACLength(DesfireContext_t *ctx);

2
doc/commands.json
View file

@ -13376,6 +13376,6 @@
"metadata": { "metadata": {
"commands_extracted": 768, "commands_extracted": 768,
"extracted_by": "PM3Help2JSON v1.00", "extracted_by": "PM3Help2JSON v1.00",
"extracted_on": "2025-06-08T07:56:09" "extracted_on": "2025-06-08T14:05:43"
} }
} }