From 00e3f22ecc79572da4045d66d49535abf1d769b9 Mon Sep 17 00:00:00 2001
From: merlokk <807634+merlokk@users.noreply.github.com>
Date: Wed, 11 Aug 2021 20:36:22 +0300
Subject: [PATCH] remove debug and save to default

---
 client/src/cmdhfmfdes.c | 23 +++++++++++++++++++----
 1 file changed, 19 insertions(+), 4 deletions(-)

diff --git a/client/src/cmdhfmfdes.c b/client/src/cmdhfmfdes.c
index aadda4179..5fc43de19 100644
--- a/client/src/cmdhfmfdes.c
+++ b/client/src/cmdhfmfdes.c
@@ -1463,13 +1463,10 @@ static int CmdHF14aDesDetect(const char *Cmd) {
             
             while (!found) {
                 res = loadFileDICTIONARYEx((char *)dict_filename, keyList, sizeof(keyList), NULL, keylen, &keyListLen, endFilePosition, &endFilePosition, verbose);
-                PrintAndLogEx(ERR, "--res: %d endFilePosition: %d keyListLen: %d", res, endFilePosition, keyListLen);
                 if (res != 1 && res != PM3_SUCCESS)
                     break;
             
                 for (int i = 0; i < keyListLen; i++) {
-                    PrintAndLogEx(ERR, "--key:[%02d] %s", i, sprint_hex(&keyList[i * keylen], keylen));
-
                     res = DesfireAuthCheck(&dctx, appid, securechann, &keyList[i * keylen]);
                     if (res == PM3_SUCCESS) {
                         found = true;
@@ -1520,7 +1517,25 @@ static int CmdHF14aDesDetect(const char *Cmd) {
     DropField();
     
     if (found && save) {
-        
+        defaultKeyNum = dctx.keyNum;
+        defaultAlgoId = dctx.keyType;
+        memcpy(defaultKey, dctx.key, DESFIRE_MAX_KEY_SIZE);
+        defaultKdfAlgo = dctx.kdfAlgo;
+        defaultKdfInputLen = dctx.kdfInputLen;
+        memcpy(defaultKdfInput, dctx.kdfInput, sizeof(dctx.kdfInput));
+        defaultSecureChannel = securechann;
+        defaultCommSet = dctx.cmdSet;
+
+        PrintAndLogEx(INFO, "-----------" _CYAN_("Default parameters") "---------------------------------");
+
+        PrintAndLogEx(INFO, "Key Num     : %d", defaultKeyNum);
+        PrintAndLogEx(INFO, "Algo        : %s", CLIGetOptionListStr(DesfireAlgoOpts, defaultAlgoId));
+        PrintAndLogEx(INFO, "Key         : %s", sprint_hex(defaultKey, desfire_get_key_length(defaultAlgoId)));
+        PrintAndLogEx(INFO, "KDF algo    : %s", CLIGetOptionListStr(DesfireKDFAlgoOpts, defaultKdfAlgo));
+        PrintAndLogEx(INFO, "KDF input   : [%d] %s", defaultKdfInputLen, sprint_hex(defaultKdfInput, defaultKdfInputLen));
+        PrintAndLogEx(INFO, "Secure chan : %s", CLIGetOptionListStr(DesfireSecureChannelOpts, defaultSecureChannel));
+        PrintAndLogEx(INFO, "Command set : %s", CLIGetOptionListStr(DesfireCommandSetOpts, defaultCommSet));
+        PrintAndLogEx(INFO, _GREEN_("Saved"));
     }
     
     return PM3_SUCCESS;