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

Merge branch 'master' of github.com:merlokk/proxmark3i into mf_mad

Browse source 
# Conflicts:
#	client/cmdhfmf.c
#	client/mifare/mifarehost.c
This commit is contained in:
merlokk 2019-03-01 19:37:43 +02:00
commit ee9daac029
63 changed files with 1216 additions and 862 deletions
Download patch file Download diff file Expand all files Collapse all files

16
client/mifare/mifarehost.c
View file

@ -1,4 +1,4 @@
// Merlok, 2011, 2012
// Merlok, 2011, 2012, 2019
// people from mifare@nethemba.com, 2010
//
// This code is licensed to you under the terms of the GNU GPL, version 2 or,
@ -982,11 +982,11 @@ int detect_classic_nackbug(bool verbose){
if (verbose) {
PrintAndLogEx(FAILED, "card random number generator seems to be based on the well-known generating polynomial");
PrintAndLogEx(NORMAL, "[- ]with 16 effective bits only, but shows unexpected behavior, try again.");
return 0;
}
return 2;
}
case 2 : PrintAndLogEx(SUCCESS, "always leak NACK detected"); return 3;
case 1 : PrintAndLogEx(SUCCESS, "NACK bug detected"); return 1;
case 2 : PrintAndLogEx(SUCCESS, _GREEN_(always leak NACK detected)); return 3;
case 1 : PrintAndLogEx(SUCCESS, _GREEN_(NACK bug detected)); return 1;
case 0 : PrintAndLogEx(SUCCESS, "No NACK bug detected"); return 2;
default : PrintAndLogEx(WARNING, "errorcode from device [%i]", ok); return 0;
}
@ -1007,9 +1007,9 @@ void detect_classic_magic(void) {
isGeneration = resp.arg[0] & 0xff;
switch( isGeneration ){
case 1: PrintAndLogEx(SUCCESS, "Answers to magic commands (GEN 1a): YES"); break;
case 2: PrintAndLogEx(SUCCESS, "Answers to magic commands (GEN 1b): YES"); break;
//case 4: PrintAndLogEx(SUCCESS, "Answers to magic commands (GEN 2): YES"); break;
default: PrintAndLogEx(INFO, "Answers to magic commands: NO"); break;
case 1: PrintAndLogEx(SUCCESS, "Answers to magic commands (GEN 1a): " _GREEN_(YES)); break;
case 2: PrintAndLogEx(SUCCESS, "Answers to magic commands (GEN 1b): " _GREEN_(YES)); break;
//case 4: PrintAndLogEx(SUCCESS, "Answers to magic commands (GEN 2): " _GREEN_(YES)); break;
default: PrintAndLogEx(INFO, "Answers to magic commands: " _YELLOW_(NO)); break;
}
}

2
client/mifare/mifarehost.h
View file

@ -1,4 +1,4 @@
// Merlok, 2011
// Merlok, 2011, 2019
// people from mifare@nethemba.com, 2010
//
// This code is licensed to you under the terms of the GNU GPL, version 2 or,