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

Update cmdlft55xx.c

Browse source 
Use generator function
This commit is contained in:
mwalker33 2020-09-26 17:31:46 +10:00
commit e05a10f3e5
1 changed files with 3 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

6
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,10 +3036,7 @@ 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
// Final formula found by paleopterix (proxmark forum)
cardPassword = 0x00010303 + ((ID & 0x86ee00ec) ^ ((ID & 0x000000ec) << 8) ^ ((ID & 0x86000000) >> 16));
cmdp += 2; cmdp += 2;
break; break;
default: default: