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

FIX: this commit solves a sneaky bug in 'LF VIKING' commands. The getVikingBits dropped the highest byte in the uid while creating the datablocks for the clone.

Browse Source 
ADD:  added some extra message in debugmode when looking at viking tags.
This commit is contained in:
iceman1001
2016-04-24 21:41:45 +02:00
parent 21d359f68f
commit c0afa86f75
3 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
client/cmddata.c
View File

@@ -660,7 +660,7 @@ int CmdVikingDemod(const char *Cmd)
//call lfdemod.c demod for Viking
int ans = VikingDemod_AM(DemodBuffer, &size);
if (ans < 0) {
if (g_debugMode) PrintAndLog("Error Viking_Demod %d", ans);
if (g_debugMode) PrintAndLog("Error Viking_Demod %d %s", ans, (ans == -5)?"[chksum error]":"");
return 0;
}
//got a good demod

4
client/cmdlfviking.c
View File

@@ -47,9 +47,9 @@ int usage_lf_viking_sim(void) {
// calc checksum
uint64_t getVikingBits(uint32_t id) {
uint8_t checksum = (id>>24) ^ ((id>>16) & 0xFF) ^ ((id>>8) & 0xFF) ^ (id & 0xFF) ^ 0xF2 ^ 0xA8;
uint8_t checksum = ((id>>24) & 0xFF) ^ ((id>>16) & 0xFF) ^ ((id>>8) & 0xFF) ^ (id & 0xFF) ^ 0xF2 ^ 0xA8;
uint64_t ret = (uint64_t)0xF2 << 56;
ret |= (id << 8);
ret |= (uint64_t)id << 8;
ret |= checksum;
return ret;
}