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

FIX: CoverityScan complains on getchar(), not reading the returning value

Browse source
This commit is contained in:
iceman1001 2016-01-19 16:58:07 +01:00
commit 0697080e26
2 changed files with 22 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

25
client/cmdhfmf.c
View file

@ -20,6 +20,7 @@ int CmdHF14AMifare(const char *Cmd)
uint32_t nt = 0, nr = 0; uint32_t nt = 0, nr = 0;
uint64_t par_list = 0, ks_list = 0, r_key = 0; uint64_t par_list = 0, ks_list = 0, r_key = 0;
int16_t isOK = 0; int16_t isOK = 0;
int tmpchar;
UsbCommand c = {CMD_READER_MIFARE, {true, 0, 0}}; UsbCommand c = {CMD_READER_MIFARE, {true, 0, 0}};
@ -29,21 +30,25 @@ int CmdHF14AMifare(const char *Cmd)
printf("Press button on the proxmark3 device to abort both proxmark3 and client.\n"); printf("Press button on the proxmark3 device to abort both proxmark3 and client.\n");
printf("-------------------------------------------------------------------------\n"); printf("-------------------------------------------------------------------------\n");
time_t time1 = clock(); clock_t t = clock();
start: start:
clearCommandBuffer(); clearCommandBuffer();
SendCommand(&c); SendCommand(&c);
//flush queue //flush queue
while (ukbhit()) getchar(); while (ukbhit()) {
tmpchar = getchar();
(void)tmpchar;
}
// wait cycle // wait cycle
while (true) { while (true) {
printf("."); printf(".");
fflush(stdout); fflush(stdout);
if (ukbhit()) { if (ukbhit()) {
getchar(); tmpchar = getchar();
(void)tmpchar;
printf("\naborted via keyboard!\n"); printf("\naborted via keyboard!\n");
break; break;
} }
@ -86,9 +91,9 @@ start:
printf("------------------------------------------------------------------\n"); printf("------------------------------------------------------------------\n");
PrintAndLog("Found valid key: %012"llx" \n", r_key); PrintAndLog("Found valid key: %012"llx" \n", r_key);
} }
t = clock() - t;
PrintAndLog("Time in darkside: %1.0f seconds", (float)(clock() - time1)/CLOCKS_PER_SEC); //printf("Time in darkside: %d ticks - %1.2f seconds\n", t, ((float)t)/CLOCKS_PER_SEC);
PrintAndLog(""); printf("Time in darkside: %Lf ticks - %1.2Lf seconds\n", (long double)t, ((long double)t)/CLOCKS_PER_SEC);
return 0; return 0;
} }
@ -765,7 +770,7 @@ int CmdHF14AMfNested(const char *Cmd)
} }
} }
PrintAndLog("Time in nested: %1.3f (%1.3f sec per key)\n\n", ((float)clock() - time1)/CLOCKS_PER_SEC, ((float)clock() - time1)/iterations/CLOCKS_PER_SEC); PrintAndLog("Time in nested: %1.2f (%1.2f sec per key)\n\n", ((float)clock() - time1)/CLOCKS_PER_SEC, ((float)clock() - time1)/iterations/CLOCKS_PER_SEC);
PrintAndLog("-----------------------------------------------\nIterations count: %d\n\n", iterations); PrintAndLog("-----------------------------------------------\nIterations count: %d\n\n", iterations);
//print them //print them
@ -1120,7 +1125,7 @@ int CmdHF14AMfChk(const char *Cmd)
} }
} }
// time // time
time_t time1 = clock(); clock_t time1 = clock();
for ( int t = !keyType; t < 2; keyType==2?(t++):(t=2) ) { for ( int t = !keyType; t < 2; keyType==2?(t++):(t=2) ) {
int b=blockNo; int b=blockNo;
@ -2012,6 +2017,7 @@ int CmdHF14AMfSniff(const char *Cmd){
bool wantSaveToEmlFile = 0; bool wantSaveToEmlFile = 0;
//var //var
int tmpchar;
int res = 0; int res = 0;
int len = 0; int len = 0;
int blockLen = 0; int blockLen = 0;
@ -2062,7 +2068,8 @@ int CmdHF14AMfSniff(const char *Cmd){
printf("."); printf(".");
fflush(stdout); fflush(stdout);
if (ukbhit()) { if (ukbhit()) {
getchar(); tmpchar = getchar();
(void)tmpchar;
printf("\naborted via keyboard!\n"); printf("\naborted via keyboard!\n");
break; break;
} }

7
client/cmdlft55xx.c
View file

@ -1377,6 +1377,7 @@ int CmdT55xxBruteForce(const char *Cmd) {
char buf[9]; char buf[9];
char filename[FILE_PATH_SIZE]={0}; char filename[FILE_PATH_SIZE]={0};
int keycnt = 0; int keycnt = 0;
int c;
uint8_t stKeyBlock = 20; uint8_t stKeyBlock = 20;
uint8_t *keyBlock = NULL, *p = NULL; uint8_t *keyBlock = NULL, *p = NULL;
keyBlock = calloc(stKeyBlock, 6); keyBlock = calloc(stKeyBlock, 6);
@ -1451,7 +1452,8 @@ int CmdT55xxBruteForce(const char *Cmd) {
for (uint16_t c = 0; c < keycnt; ++c ) { for (uint16_t c = 0; c < keycnt; ++c ) {
if (ukbhit()) { if (ukbhit()) {
getchar(); c = getchar();
(void)c;
printf("\naborted via keyboard!\n"); printf("\naborted via keyboard!\n");
free(keyBlock); free(keyBlock);
return 0; return 0;
@ -1501,7 +1503,8 @@ int CmdT55xxBruteForce(const char *Cmd) {
printf("."); printf(".");
fflush(stdout); fflush(stdout);
if (ukbhit()) { if (ukbhit()) {
getchar(); c = getchar();
(void)c;
printf("\naborted via keyboard!\n"); printf("\naborted via keyboard!\n");
free(keyBlock); free(keyBlock);
return 0; return 0;