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

monster merge...

Browse source 
all those changes marshmellow did..  and more...
This commit is contained in:
iceman1001 2017-07-30 09:17:48 +02:00
commit f28da2da6e
107 changed files with 5087 additions and 3777 deletions
Download patch file Download diff file Expand all files Collapse all files

4
client/mifarehost.c
View file

@ -109,7 +109,7 @@ int mfDarkside(uint8_t blockno, uint8_t key_type, uint64_t *key)
//flush queue
while (ukbhit()) {
int gc = getchar(); (void) gc;
int gc = getchar(); (void)gc;
}
// wait cycle
@ -117,7 +117,7 @@ int mfDarkside(uint8_t blockno, uint8_t key_type, uint64_t *key)
printf(".");
fflush(stdout);
if (ukbhit()) {
int gc = getchar(); (void) gc;
int gc = getchar(); (void)gc;
return -5;
break;
}