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

FIX: made the authentication part a bit clearer. It now uses two booleans to seperate which type of authentication was requested from user.

Browse source
This commit is contained in:
iceman1001 2015-05-20 21:44:22 +02:00
commit c81a80dc96
1 changed files with 18 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

32
client/cmdhfmfu.c
View file

@ -18,7 +18,7 @@
#define MAX_UL_BLOCKS 0x0f #define MAX_UL_BLOCKS 0x0f
#define MAX_ULC_BLOCKS 0x2b #define MAX_ULC_BLOCKS 0x2b
#define MAX_ULEV1a_BLOCKS 0x13 #define MAX_ULEV1a_BLOCKS 0x13
#define MAX_ULEV1b_BLOCKS 0x28 #define MAX_ULEV1b_BLOCKS 0x28
#define MAX_NTAG_203 0x29 #define MAX_NTAG_203 0x29
#define MAX_NTAG_210 0x13 #define MAX_NTAG_210 0x13
@ -620,12 +620,13 @@ int CmdHF14AMfUInfo(const char *Cmd){
int status; int status;
bool errors = false; bool errors = false;
bool hasAuthKey = false; bool hasAuthKey = false;
bool hasPwdKey = false;
bool locked = false; bool locked = false;
uint8_t cmdp = 0; uint8_t cmdp = 0;
uint8_t datalen = 0; uint8_t datalen = 0;
uint8_t authenticationkey[16] = {0x00}; uint8_t authenticationkey[16] = {0x00};
uint8_t pack[4] = {0,0,0,0}; uint8_t pack[4] = {0,0,0,0};
int len=0; int len = 0;
while(param_getchar(Cmd, cmdp) != 0x00) while(param_getchar(Cmd, cmdp) != 0x00)
{ {
@ -641,7 +642,7 @@ int CmdHF14AMfUInfo(const char *Cmd){
if ( !datalen ) { if ( !datalen ) {
memcpy(authenticationkey, data, 4); memcpy(authenticationkey, data, 4);
cmdp += 2; cmdp += 2;
hasAuthKey = true; hasPwdKey = true;
break; break;
} }
// UL-C size key // UL-C size key
@ -672,22 +673,22 @@ int CmdHF14AMfUInfo(const char *Cmd){
PrintAndLog("-------------------------------------------------------------"); PrintAndLog("-------------------------------------------------------------");
ul_print_type(tagtype, 6); ul_print_type(tagtype, 6);
if (!ul_select(&card)) return 0;
if ( hasAuthKey && (tagtype & UL_C)) { if ( hasAuthKey && (tagtype & UL_C)) {
//will select card automatically and close connection on error //will select card automatically and close connection on error
if (!ulc_authentication(authenticationkey, false)) { if (!ulc_authentication(authenticationkey, false)) {
PrintAndLog("Error: Authentication Failed UL-C"); PrintAndLog("Error: Authentication Failed UL-C");
return 0; return 0;
} }
} else { }
if ( !ul_select(&card) ) return 0;
if (hasAuthKey) { if ( hasPwdKey ) {
len = ulev1_requestAuthentication(authenticationkey, pack, sizeof(pack)); len = ulev1_requestAuthentication(authenticationkey, pack, sizeof(pack));
if (len < 1) { if (len < 1) {
ul_switch_off_field(); ul_switch_off_field();
PrintAndLog("Error: Authentication Failed UL-EV1/NTAG"); PrintAndLog("Error: Authentication Failed UL-EV1/NTAG");
return 0; return 0;
}
} }
} }
@ -698,6 +699,7 @@ int CmdHF14AMfUInfo(const char *Cmd){
PrintAndLog("Error: tag didn't answer to READ"); PrintAndLog("Error: tag didn't answer to READ");
return status; return status;
} }
if (status == 16) { if (status == 16) {
ul_print_default(data); ul_print_default(data);
ndef_print_CC(data+12); ndef_print_CC(data+12);