Merge pull request #81 from mdp/fixguard

[proxmark3-svn] / client / cmdlfviking.c

diff --git a/client/cmdlfviking.c b/client/cmdlfviking.c
index f717c3f9bf046528f19575296d0910462117058d..36f2a67278435f24bdd4ed538b4ba47bfbdcf34a 100644 (file)
--- a/client/cmdlfviking.c
+++ b/client/cmdlfviking.c
@@ -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;
 }
@@ -60,7 +60,7 @@ int CmdVikingRead(const char *Cmd) {
        // read lf silently
        CmdLFRead("s");
        // get samples silently
-       getSamples("30000",false);
+       getSamples("12000", TRUE);
        // demod and output viking ID   
        return CmdVikingDemod(Cmd);
 }
@@ -80,7 +80,8 @@ int CmdVikingClone(const char *Cmd) {
                Q5 = true;
 
        rawID = getVikingBits(id);
-
+       
+       PrintAndLog("Cloning - ID: %08X, Raw: %08X%08X",id,(uint32_t)(rawID >> 32),(uint32_t) (rawID & 0xFFFFFFFF));
        UsbCommand c = {CMD_VIKING_CLONE_TAG,{rawID >> 32, rawID & 0xFFFFFFFF, Q5}};
        clearCommandBuffer();
     SendCommand(&c);
@@ -107,9 +108,10 @@ int CmdVikingSim(const char *Cmd) {
        arg1 = clk << 8 | encoding;
        arg2 = invert << 8 | separator;
 
+       PrintAndLog("Simulating - ID: %08X, Raw: %08X%08X",id,(uint32_t)(rawID >> 32),(uint32_t) (rawID & 0xFFFFFFFF));
+       
        UsbCommand c = {CMD_ASK_SIM_TAG, {arg1, arg2, size}};
-       PrintAndLog("preparing to sim ask data: %d bits", size);
-       num_to_bytebits(rawID, 64, c.d.asBytes);
+       num_to_bytebits(rawID, size, c.d.asBytes);
        clearCommandBuffer();
        SendCommand(&c);
        return 0;
@@ -124,6 +126,7 @@ static command_t CommandTable[] = {
 };
 
 int CmdLFViking(const char *Cmd) {
+       clearCommandBuffer();
     CmdsParse(CommandTable, Cmd);
     return 0;
 }