ADD: added a valid pyramid T55x7 configblock.

[proxmark3-svn] / client / cmdlfviking.c

diff --git a/client/cmdlfviking.c b/client/cmdlfviking.c
index a338d5a3eed63a6d819016fe4555b4bae4b8cd14..6d3362f702f805a07d994ccad2e0fb5c2f8cebe4 100644 (file)
--- a/client/cmdlfviking.c
+++ b/client/cmdlfviking.c
@@ -53,6 +53,7 @@ uint64_t getVikingBits(uint32_t id) {
        ret     |= checksum;
        return ret;
 }
+
 //by marshmellow
 //see ASKDemod for what args are accepted
 int CmdVikingRead(const char *Cmd) {
@@ -69,7 +70,7 @@ int CmdVikingClone(const char *Cmd) {
        uint64_t rawID = 0;
        bool Q5 = false;
        char cmdp = param_getchar(Cmd, 0);
-       if (strlen(Cmd) < 0 || cmdp == 'h' || cmdp == 'H') return usage_lf_viking_clone();
+       if (strlen(Cmd) == 0 || cmdp == 'h' || cmdp == 'H') return usage_lf_viking_clone();
        
        id = param_get32ex(Cmd, 0, 0, 16);
        if (id == 0) return usage_lf_viking_clone();
@@ -79,8 +80,9 @@ int CmdVikingClone(const char *Cmd) {
                Q5 = true;
 
        rawID = getVikingBits(id);
-
-       UsbCommand c = {CMD_VIKING_CLONE_TAG,{rawID >> 32, rawID & 0xFFFF, Q5}};
+       
+       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);
        //check for ACK
@@ -94,7 +96,7 @@ int CmdVikingSim(const char *Cmd) {
        uint8_t clk = 32, encoding = 1, separator = 0, invert = 0;
 
        char cmdp = param_getchar(Cmd, 0);
-       if (strlen(Cmd) < 0 || cmdp == 'h' || cmdp == 'H') return usage_lf_viking_sim();
+       if (strlen(Cmd) == 0 || cmdp == 'h' || cmdp == 'H') return usage_lf_viking_sim();
 
        id = param_get32ex(Cmd, 0, 0, 16);
        if (id == 0) return usage_lf_viking_sim();
@@ -106,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;