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

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
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;
}

13
common/lfdemod.c
View file

@ -679,10 +679,15 @@ int VikingDemod_AM(uint8_t *dest, size_t *size) {
uint8_t preamble[] = {1,1,1,1,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0};
uint8_t errChk = preambleSearch(dest, preamble, sizeof(preamble), size, &startIdx);
if (errChk == 0) return -4; //preamble not found
uint32_t checkCalc = bytebits_to_byte(dest+startIdx,8) ^ bytebits_to_byte(dest+startIdx+8,8) ^ bytebits_to_byte(dest+startIdx+16,8)
^ bytebits_to_byte(dest+startIdx+24,8) ^ bytebits_to_byte(dest+startIdx+32,8) ^ bytebits_to_byte(dest+startIdx+40,8)
^ bytebits_to_byte(dest+startIdx+48,8) ^ bytebits_to_byte(dest+startIdx+56,8);
if ( checkCalc != 0xA8 ) return -5;
uint32_t checkCalc = bytebits_to_byte(dest+startIdx,8) ^
bytebits_to_byte(dest+startIdx+8,8) ^
bytebits_to_byte(dest+startIdx+16,8) ^
bytebits_to_byte(dest+startIdx+24,8) ^
bytebits_to_byte(dest+startIdx+32,8) ^
bytebits_to_byte(dest+startIdx+40,8) ^
bytebits_to_byte(dest+startIdx+48,8) ^
bytebits_to_byte(dest+startIdx+56,8);
if ( checkCalc != 0xA8 ) return -5;
if (*size != 64) return -6;
//return start position
return (int) startIdx;