RfidResearchGroup/proxmark3
1
1
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2025-03-27 15:33:16 +08:00
Code Issues Projects Releases Packages Wiki Activity

add commant, remove debug

Browse source
This commit is contained in:
merlokk 2021-07-04 12:25:34 +03:00
parent 2abd930ef7
commit 5271cb96c3
2 changed files with 1 additions and 6 deletions
client
deps/cliparser
cliparser.h
src
cmdhfmfdes.c

1
client/deps/cliparser/cliparser.h
View file

@ -63,6 +63,7 @@ typedef struct {
} CLIParserContext; } CLIParserContext;
#define CLI_MAX_OPTLIST_LEN 50 #define CLI_MAX_OPTLIST_LEN 50
// option list needs to have NULL at the last record int the field `text`
typedef struct { typedef struct {
int code; int code;
const char *text; const char *text;

6
client/src/cmdhfmfdes.c
View file

@ -5033,7 +5033,6 @@ static int CmdDesGetSessionParameters(CLIParserContext *ctx, DesfireContext *dct
if (algoid) { if (algoid) {
if (CLIGetOptionList(arg_get_str(ctx, algoid), DesfireAlgoOpts, &algores)) if (CLIGetOptionList(arg_get_str(ctx, algoid), DesfireAlgoOpts, &algores))
return PM3_ESOFT; return PM3_ESOFT;
PrintAndLogEx(INFO, "algo: %s", CLIGetOptionListStr(DesfireAlgoOpts, algores));
} }
if (keyid) { if (keyid) {
@ -5052,8 +5051,6 @@ static int CmdDesGetSessionParameters(CLIParserContext *ctx, DesfireContext *dct
if (kdfid) { if (kdfid) {
if (CLIGetOptionList(arg_get_str(ctx, kdfid), DesfireKDFAlgoOpts, &kdfAlgo)) if (CLIGetOptionList(arg_get_str(ctx, kdfid), DesfireKDFAlgoOpts, &kdfAlgo))
return PM3_ESOFT; return PM3_ESOFT;
PrintAndLogEx(INFO, "kdf funct: %s", CLIGetOptionListStr(DesfireKDFAlgoOpts, kdfAlgo));
} }
if (kdfiid) { if (kdfiid) {
@ -5070,19 +5067,16 @@ static int CmdDesGetSessionParameters(CLIParserContext *ctx, DesfireContext *dct
if (cmodeid) { if (cmodeid) {
if (CLIGetOptionList(arg_get_str(ctx, cmodeid), DesfireCommunicationModeOpts, &commmode)) if (CLIGetOptionList(arg_get_str(ctx, cmodeid), DesfireCommunicationModeOpts, &commmode))
return PM3_ESOFT; return PM3_ESOFT;
PrintAndLogEx(INFO, "comm mode: %s", CLIGetOptionListStr(DesfireCommunicationModeOpts, commmode));
} }
if (ccsetid) { if (ccsetid) {
if (CLIGetOptionList(arg_get_str(ctx, ccsetid), DesfireCommandSetOpts, &commset)) if (CLIGetOptionList(arg_get_str(ctx, ccsetid), DesfireCommandSetOpts, &commset))
return PM3_ESOFT; return PM3_ESOFT;
PrintAndLogEx(INFO, "comm mode: %s", CLIGetOptionListStr(DesfireCommandSetOpts, commset));
} }
if (schannid) { if (schannid) {
if (CLIGetOptionList(arg_get_str(ctx, schannid), DesfireSecureChannelOpts, &secchann)) if (CLIGetOptionList(arg_get_str(ctx, schannid), DesfireSecureChannelOpts, &secchann))
return PM3_ESOFT; return PM3_ESOFT;
PrintAndLogEx(INFO, "auth channel: %s", CLIGetOptionListStr(DesfireSecureChannelOpts, secchann));
} }
DesfireSetKey(dctx, keynum, algores, key); DesfireSetKey(dctx, keynum, algores, key);