remove comments and text fixes
This commit is contained in:
1 parent
d354ac90fd
commit
0aad993711
2 files changed
+15
-24
No files matched your search
+15
-8
@@ -5017,6 +5017,9 @@ static int CmdHF14ADesGetAIDs(const char *Cmd) {
|
||||
};
|
||||
CLIExecWithReturn(ctx, Cmd, argtable, false);
|
||||
|
||||
bool APDULogging = arg_get_lit(ctx, 1);
|
||||
bool verbose = arg_get_lit(ctx, 2);
|
||||
uint8_t keyNum = arg_get_int_def(ctx, 3, 0); // defaultKeyId
|
||||
|
||||
/*
|
||||
int aidlength = 0;
|
||||
@@ -5100,13 +5103,12 @@ static int CmdHF14ADesGetAIDs(const char *Cmd) {
|
||||
uint8_t cmdKDFAlgo = arg_get_int_def(ctx, 9, 0);
|
||||
CLIGetHexWithReturn(ctx, 10, kdfInput, &kdfInputLen);
|
||||
*/
|
||||
// SetAPDULogging(APDULogging);
|
||||
SetAPDULogging(true);
|
||||
SetAPDULogging(APDULogging);
|
||||
CLIParserFree(ctx);
|
||||
|
||||
uint8_t key[24] = {0};
|
||||
DesfireContext dctx;
|
||||
DesfireSetKey(&dctx, 0, T_DES, key); // T_DES T_3DES T_3K3DES T_AES
|
||||
DesfireSetKey(&dctx, keyNum, T_DES, key); // T_DES T_3DES T_3K3DES T_AES
|
||||
DesfireSetCommandChannel(&dctx, DCCNativeISO);
|
||||
|
||||
|
||||
@@ -5124,10 +5126,12 @@ static int CmdHF14ADesGetAIDs(const char *Cmd) {
|
||||
return PM3_ESOFT;
|
||||
}
|
||||
|
||||
if (DesfireIsAuthenticated(&dctx))
|
||||
PrintAndLogEx(ERR, "Desfire " _GREEN_("authenticated") , res);
|
||||
else
|
||||
if (DesfireIsAuthenticated(&dctx)) {
|
||||
if (verbose)
|
||||
PrintAndLogEx(ERR, "Desfire " _GREEN_("authenticated") , res);
|
||||
} else {
|
||||
return PM3_ESOFT;
|
||||
}
|
||||
|
||||
uint8_t buf[APDU_RES_LEN] = {0};
|
||||
size_t buflen = 0;
|
||||
@@ -5139,8 +5143,11 @@ static int CmdHF14ADesGetAIDs(const char *Cmd) {
|
||||
return PM3_ESOFT;
|
||||
}
|
||||
|
||||
for (int i = 0; i < buflen; i += 3)
|
||||
PrintAndLogEx(INFO, "AID: %06x", DesfireAIDByteToUint(&buf[i]));
|
||||
if (buflen >= 3) {
|
||||
PrintAndLogEx(INFO, "---- " _CYAN_("AID list") " ----");
|
||||
for (int i = 0; i < buflen; i += 3)
|
||||
PrintAndLogEx(INFO, "AID: %06x", DesfireAIDByteToUint(&buf[i]));
|
||||
}
|
||||
|
||||
DropField();
|
||||
return PM3_SUCCESS;
|
||||
|
||||
@@ -601,17 +601,6 @@ int DesfireAuthenticate(DesfireContext *dctx, DesfireAuthChannel authChannel) {
|
||||
// Part 4
|
||||
memcpy(encRndA, recv_data, rndlen);
|
||||
|
||||
// tag->session_key = &default_key;
|
||||
/*struct desfire_key *p = realloc(tag->session_key, sizeof(struct desfire_key));
|
||||
if (!p) {
|
||||
PrintAndLogEx(FAILED, "Cannot allocate memory for session keys");
|
||||
free(tag->session_key);
|
||||
return PM3_EMALLOC;
|
||||
}
|
||||
tag->session_key = p;
|
||||
|
||||
memset(tag->session_key, 0x00, sizeof(struct desfire_key));
|
||||
*/
|
||||
struct desfire_key sesskey = {0};
|
||||
|
||||
Desfire_session_key_new(RndA, RndB, key, &sesskey);
|
||||
@@ -651,11 +640,6 @@ PrintAndLogEx(INFO, "Generated_RndA : %s", sprint_hex(encRndA, rndlen));
|
||||
memcpy(&dctx->sessionKeyEnc[8], dctx->sessionKeyEnc, 8);
|
||||
}
|
||||
|
||||
// rpayload->sessionkeylen = payload->keylen;
|
||||
// memcpy(rpayload->sessionkey, tag->session_key->data, rpayload->sessionkeylen);
|
||||
// memset(tag->ivect, 0, MAX_CRYPTO_BLOCK_SIZE);
|
||||
// tag->authenticated_key_no = payload->keyno;
|
||||
|
||||
if (dctx->authChannel == DACEV1) {
|
||||
cmac_generate_subkeys(&sesskey, MCD_RECEIVE);
|
||||
//key->cmac_sk1 and key->cmac_sk2
|
||||
|
||||
Reference in new issue
Block a user