dash/proxmark3
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update cmdlft55xx.c

Browse Source 
Use generator function
This commit is contained in:
mwalker33
2020-09-26 17:31:46 +10:00
parent 131b587846
commit e05a10f3e5
1 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
client/src/cmdlft55xx.c
View File

@@ -29,6 +29,7 @@
#include "fileutils.h" // loadDictionary #include "fileutils.h" // loadDictionary
#include "util_posix.h" #include "util_posix.h"
#include "cmdlf.h" // for lf sniff #include "cmdlf.h" // for lf sniff
#include "generator.h"
// Some defines for readability // Some defines for readability
#define T55XX_DLMODE_FIXED 0 // Default Mode #define T55XX_DLMODE_FIXED 0 // Default Mode
@@ -3035,11 +3036,8 @@ static int CmdT55xxChkPwds(const char *Cmd) {
case 'e': case 'e':
// White cloner password based on EM4100 ID // White cloner password based on EM4100 ID
useCardPassword = true; useCardPassword = true;
uint64_t EMID = param_get64ex(Cmd,cmdp + 1,0,16); // Get 5 byte EM4100 ID cardPassword = lf_t55xx_white_pwdgen (param_get64ex(Cmd,cmdp + 1,0,16) & 0xFFFFFFFF);
uint32_t ID = EMID & 0xFFFFFFFF; // White Cloner only using low 32 bits cmdp += 2;
// Final formula found by paleopterix (proxmark forum)
cardPassword = 0x00010303 + ((ID & 0x86ee00ec) ^ ((ID & 0x000000ec) << 8) ^ ((ID & 0x86000000) >> 16));
cmdp+=2;
break; break;
default: default:
PrintAndLogEx(WARNING, "Unknown parameter '%c'", param_getchar(Cmd, cmdp)); PrintAndLogEx(WARNING, "Unknown parameter '%c'", param_getchar(Cmd, cmdp));