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

use PrintAndLogEx() instead of PrintAndLog(), remove uerr()

Browse source
This commit is contained in:
Brian Pow 2018-02-21 19:50:42 +08:00
commit e68055ac65
1 changed files with 35 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

68
client/cmdcrc.c
View file

@ -11,11 +11,6 @@
#define MAX_ARGS 20 #define MAX_ARGS 20
int uerr(char *msg){
PrintAndLog("%s",msg);
return 0;
}
int split(char *str, char *arr[MAX_ARGS]){ int split(char *str, char *arr[MAX_ARGS]){
int beginIndex = 0; int beginIndex = 0;
int endIndex; int endIndex;
@ -87,17 +82,19 @@ int GetModels(char *Models[], int *count, uint8_t *width){
int Cnt = 0; int Cnt = 0;
if (width[0] == 0) { //reveng -D if (width[0] == 0) { //reveng -D
*count = mcount(); *count = mcount();
if (!*count) if (!*count){
return uerr("[-] no preset models available"); PrintAndLogEx(WARNING, "no preset models available");
return 0;
}
for (int mode = 0; mode < *count; ++mode) { for (int mode = 0; mode < *count; ++mode) {
mbynum(&model, mode); mbynum(&model, mode);
mcanon(&model); mcanon(&model);
size_t size = (model.name && *model.name) ? strlen(model.name) : 7; size_t size = (model.name && *model.name) ? strlen(model.name) : 7;
char *tmp = calloc(size+1, sizeof(char)); char *tmp = calloc(size+1, sizeof(char));
if (tmp==NULL) if (tmp==NULL){
return uerr("[!] out of memory?"); PrintAndLogEx(WARNING, "out of memory?");
return 0;
}
memcpy(tmp, model.name, size); memcpy(tmp, model.name, size);
Models[mode] = tmp; Models[mode] = tmp;
width[mode] = plen(model.spoly); width[mode] = plen(model.spoly);
@ -105,9 +102,10 @@ int GetModels(char *Models[], int *count, uint8_t *width){
mfree(&model); mfree(&model);
} else { //reveng -s } else { //reveng -s
if (~model.flags & P_MULXN) if (~model.flags & P_MULXN){
return uerr("[!] cannot search for non-Williams compliant models"); PrintAndLogEx(WARNING, "cannot search for non-Williams compliant models");
return 0;
}
praloc(&model.spoly, (unsigned long)width[0]); praloc(&model.spoly, (unsigned long)width[0]);
praloc(&model.init, (unsigned long)width[0]); praloc(&model.init, (unsigned long)width[0]);
praloc(&model.xorout, (unsigned long)width[0]); praloc(&model.xorout, (unsigned long)width[0]);
@ -170,10 +168,10 @@ int GetModels(char *Models[], int *count, uint8_t *width){
mcanon(&pset); mcanon(&pset);
size_t size = (pset.name && *pset.name) ? strlen(pset.name) : 7; size_t size = (pset.name && *pset.name) ? strlen(pset.name) : 7;
//PrintAndLog("Size: %d, %s, count: %d",size,pset.name, Cnt); //PrintAndLogEx(NORMAL, "Size: %d, %s, count: %d",size,pset.name, Cnt);
char *tmp = calloc(size+1, sizeof(char)); char *tmp = calloc(size+1, sizeof(char));
if (tmp == NULL){ if (tmp == NULL){
PrintAndLog("[!] out of memory?"); PrintAndLogEx(WARNING, "out of memory?");
return 0; return 0;
} }
width[Cnt] = width[0]; width[Cnt] = width[0];
@ -201,9 +199,10 @@ int GetModels(char *Models[], int *count, uint8_t *width){
pfree(qptr); pfree(qptr);
} }
} }
if (!(model.flags & P_REFIN) != !(model.flags & P_REFOUT)) if (!(model.flags & P_REFIN) != !(model.flags & P_REFOUT)){
return uerr("[!] cannot search for crossed-endian models"); PrintAndLogEx(WARNING, "cannot search for crossed-endian models");
return 0;
}
pass = 0; pass = 0;
do { do {
mptr = candmods = reveng(&model, qpoly, rflags, args, apolys); mptr = candmods = reveng(&model, qpoly, rflags, args, apolys);
@ -228,8 +227,10 @@ int GetModels(char *Models[], int *count, uint8_t *width){
free(apolys); free(apolys);
mfree(&model); mfree(&model);
if (~uflags & C_RESULT) if (~uflags & C_RESULT){
return uerr("[!] no models found"); PrintAndLogEx(WARNING, "no models found");
return 0;
}
} }
return 1; return 1;
} }
@ -260,12 +261,13 @@ int RunModel(char *inModel, char *inHexStr, bool reverse, char endian, char *res
SETBMP(); SETBMP();
//set model //set model
if (!(c = mbynam(&model, inModel))) { if (!(c = mbynam(&model, inModel))) {
PrintAndLog("[!] error: preset model '%s' not found. Use reveng -D to list presets.", inModel); PrintAndLogEx(WARNING, "error: preset model '%s' not found. Use reveng -D to list presets.", inModel);
return 0;
}
if (c < 0){
PrintAndLogEx(WARNING, "no preset models available");
return 0; return 0;
} }
if (c < 0)
return uerr("[-] no preset models available");
rflags |= R_HAVEP | R_HAVEI | R_HAVERI | R_HAVERO | R_HAVEX; rflags |= R_HAVEP | R_HAVEI | R_HAVERI | R_HAVERO | R_HAVEX;
//set flags //set flags
@ -372,11 +374,11 @@ int CmdrevengTestC(const char *Cmd){
bool reverse = (param_get8(Cmd, cmdp++)) ? true : false; bool reverse = (param_get8(Cmd, cmdp++)) ? true : false;
endian = param_getchar(Cmd, cmdp++); endian = param_getchar(Cmd, cmdp++);
//PrintAndLog("mod: %s, hex: %s, rev %d", inModel, inHexStr, reverse); //PrintAndLogEx(NORMAL, "mod: %s, hex: %s, rev %d", inModel, inHexStr, reverse);
int ans = RunModel(inModel, inHexStr, reverse, endian, result); int ans = RunModel(inModel, inHexStr, reverse, endian, result);
if (!ans) return 0; if (!ans) return 0;
PrintAndLog("[+] result: %s",result); PrintAndLogEx(SUCCESS, "result: %s",result);
return 1; return 1;
} }
@ -428,19 +430,19 @@ int CmdrevengSearch(const char *Cmd){
char *outHex = calloc(dataLen-crcChars+1, sizeof(char)); char *outHex = calloc(dataLen-crcChars+1, sizeof(char));
memcpy(outHex, inHexStr, dataLen-crcChars); memcpy(outHex, inHexStr, dataLen-crcChars);
// PrintAndLog("DEBUG: dataLen: %d, crcChars: %d, Model: %s, CRC: %s, width: %d, outHex: %s",dataLen, crcChars, Models[i], inCRC, width[i], outHex); // PrintAndLogEx(DEBUG, "DEBUG: dataLen: %d, crcChars: %d, Model: %s, CRC: %s, width: %d, outHex: %s",dataLen, crcChars, Models[i], inCRC, width[i], outHex);
ans = RunModel(Models[i], outHex, false, 0, result); ans = RunModel(Models[i], outHex, false, 0, result);
if (ans) { if (ans) {
// test for match // test for match
if (memcmp(result, inCRC, crcChars) == 0){ if (memcmp(result, inCRC, crcChars) == 0){
PrintAndLog("\n[+] found possible match\n[+] model: %s | value: %s\n", Models[i], result); PrintAndLogEx(NORMAL, "\n"); PrintAndLogEx(SUCCESS, "found possible match\n[+] model: %s | value: %s\n", Models[i], result);
//optional - stop searching if found... //optional - stop searching if found...
found = true; found = true;
} else { } else {
if (crcChars > 2){ if (crcChars > 2){
char *swapEndian = SwapEndianStr(result, crcChars, crcChars); char *swapEndian = SwapEndianStr(result, crcChars, crcChars);
if (memcmp(swapEndian, inCRC, crcChars) == 0){ if (memcmp(swapEndian, inCRC, crcChars) == 0){
PrintAndLog("\n[+] found possible match\n[+] model: %s | value endian swapped: %s\n", Models[i], swapEndian); PrintAndLogEx(NORMAL, "\n"); PrintAndLogEx(SUCCESS, "found possible match\n[+] model: %s | value endian swapped: %s\n", Models[i], swapEndian);
// optional - stop searching if found... // optional - stop searching if found...
found = true; found = true;
} }
@ -452,14 +454,14 @@ int CmdrevengSearch(const char *Cmd){
if (ans) { if (ans) {
// test for match // test for match
if (memcmp(revResult, inCRC, crcChars) == 0){ if (memcmp(revResult, inCRC, crcChars) == 0){
PrintAndLog("\n[+] found possible match\n[+] model reversed: %s | value: %s\n", Models[i], revResult); PrintAndLogEx(NORMAL, "\n"); PrintAndLogEx(SUCCESS, "found possible match\n[+] model reversed: %s | value: %s\n", Models[i], revResult);
// optional - stop searching if found... // optional - stop searching if found...
found = true; found = true;
} else { } else {
if (crcChars > 2){ if (crcChars > 2){
char *swapEndian = SwapEndianStr(revResult, crcChars, crcChars); char *swapEndian = SwapEndianStr(revResult, crcChars, crcChars);
if (memcmp(swapEndian, inCRC, crcChars) == 0){ if (memcmp(swapEndian, inCRC, crcChars) == 0){
PrintAndLog("\n[+] found possible match\n[+] model reversed: %s | value endian swapped: %s\n", Models[i], swapEndian); PrintAndLogEx(NORMAL, "\n"); PrintAndLogEx(SUCCESS, "found possible match\n[+] model reversed: %s | value endian swapped: %s\n", Models[i], swapEndian);
// optional - stop searching if found... // optional - stop searching if found...
found = true; found = true;
} }
@ -472,6 +474,6 @@ int CmdrevengSearch(const char *Cmd){
free(Models[i]); free(Models[i]);
} }
if (!found) PrintAndLog("\n[-] no matches found\n"); if (!found) PrintAndLogEx(NORMAL, "\n[-] no matches found\n");
return 1; return 1;
} }