ADD: @marshmellows fixes

diff --git a/client/cmddata.c b/client/cmddata.c
index a743089463e8b09c35a8b61fcd91e09551b721cd..7514e4282b4474ade64ac3ad1501729c9a8bd89d 100644 (file)
--- a/client/cmddata.c
+++ b/client/cmddata.c
@@ -26,7 +26,7 @@
 
 uint8_t DemodBuffer[MAX_DEMOD_BUF_LEN];
 uint8_t g_debugMode;
 
 uint8_t DemodBuffer[MAX_DEMOD_BUF_LEN];
 uint8_t g_debugMode;

-int DemodBufferLen;
+size_t DemodBufferLen;

 static int CmdHelp(const char *Cmd);
 
 //set the demod buffer with given array of binary (one bit per byte)
 static int CmdHelp(const char *Cmd);
 
 //set the demod buffer with given array of binary (one bit per byte)


@@ -1484,7 +1484,7 @@ int CmdIndalaDecode(const char *Cmd)
                return 0;
        }
        uint8_t invert=0;
                return 0;
        }
        uint8_t invert=0;

-       ans = indala26decode(DemodBuffer,(size_t *) &DemodBufferLen, &invert);
+       ans = indala26decode(DemodBuffer, &DemodBufferLen, &invert);

        if (ans < 1) {
                if (g_debugMode==1)
                        PrintAndLog("Error2: %d",ans);
        if (ans < 1) {
                if (g_debugMode==1)
                        PrintAndLog("Error2: %d",ans);

diff --git a/client/cmddata.h b/client/cmddata.h
index 57f0400123ed4e6d723eb7f1755348ba944e31df..c62307368d6ef3965a3d7dad3ae2842b9afc36d5 100644 (file)
--- a/client/cmddata.h
+++ b/client/cmddata.h
@@ -70,7 +70,7 @@ int getSamples(const char *Cmd, bool silent);
 
 #define MAX_DEMOD_BUF_LEN (1024*128)
 extern uint8_t DemodBuffer[MAX_DEMOD_BUF_LEN];
 
 #define MAX_DEMOD_BUF_LEN (1024*128)
 extern uint8_t DemodBuffer[MAX_DEMOD_BUF_LEN];

-extern int DemodBufferLen;
+extern size_t DemodBufferLen;

 extern uint8_t g_debugMode;
 #define BIGBUF_SIZE 40000
 
 extern uint8_t g_debugMode;
 #define BIGBUF_SIZE 40000
 

diff --git a/client/cmdhfmfu.c b/client/cmdhfmfu.c
index 4a23011b1595ce02258ceb4994c23a298566f6d3..aed77d82ac5aa49355b0fedbb81b084a74480a4b 100644 (file)
--- a/client/cmdhfmfu.c
+++ b/client/cmdhfmfu.c
@@ -347,8 +347,7 @@ static int ulc_print_3deskey( uint8_t *data){
        PrintAndLog("         deskey1 [45/0x2D]: %s [%.4s]", sprint_hex(data+4 ,4),data+4);
        PrintAndLog("         deskey2 [46/0x2E]: %s [%.4s]", sprint_hex(data+8 ,4),data+8);
        PrintAndLog("         deskey2 [47/0x2F]: %s [%.4s]", sprint_hex(data+12,4),data+12);
        PrintAndLog("         deskey1 [45/0x2D]: %s [%.4s]", sprint_hex(data+4 ,4),data+4);
        PrintAndLog("         deskey2 [46/0x2E]: %s [%.4s]", sprint_hex(data+8 ,4),data+8);
        PrintAndLog("         deskey2 [47/0x2F]: %s [%.4s]", sprint_hex(data+12,4),data+12);

-       
-       PrintAndLog("\n 3des key : %s", sprint_hex(SwapEndian64(data, 16), 16));
+       PrintAndLog("\n 3des key : %s", sprint_hex(SwapEndian64(data, 16, 8), 16));

        return 0;
 }
 
        return 0;
 }
 


@@ -656,10 +655,9 @@ int CmdHF14AMfUInfo(const char *Cmd){
                uint8_t ulc_conf[16] = {0x00};
                status = ul_read(0x28, ulc_conf, sizeof(ulc_conf));
                if ( status == -1 ){
                uint8_t ulc_conf[16] = {0x00};
                status = ul_read(0x28, ulc_conf, sizeof(ulc_conf));
                if ( status == -1 ){

-                       PrintAndLog("Error: tag didn't answer to READ - possibly locked");
+                       PrintAndLog("Error: tag didn't answer to READ UL-C");

                        return status;
                } 
                        return status;
                } 

-

                ulc_print_configuration(ulc_conf);
 
                if ((tagtype & MAGIC)){
                ulc_print_configuration(ulc_conf);
 
                if ((tagtype & MAGIC)){


@@ -673,17 +671,19 @@ int CmdHF14AMfUInfo(const char *Cmd){
                        ulc_print_3deskey(ulc_deskey);
 
                } else {
                        ulc_print_3deskey(ulc_deskey);
 
                } else {

-                       

                        // if we called info with key, just return 
                        if ( hasAuthKey ) return 1;
                        
                        // if we called info with key, just return 
                        if ( hasAuthKey ) return 1;
                        

+                       // also try to diversify default keys..  look into CmdHF14AMfuGenDiverseKeys

                        PrintAndLog("Trying some default 3des keys");
                        ul_switch_off_field();
                        for (uint8_t i = 0; i < KEYS_3DES_COUNT; ++i ){
                                key = default_3des_keys[i];
                                if (try3DesAuthentication(key) == 1){
                                        PrintAndLog("Found default 3des key: "); //%s", sprint_hex(key,16));
                        PrintAndLog("Trying some default 3des keys");
                        ul_switch_off_field();
                        for (uint8_t i = 0; i < KEYS_3DES_COUNT; ++i ){
                                key = default_3des_keys[i];
                                if (try3DesAuthentication(key) == 1){
                                        PrintAndLog("Found default 3des key: "); //%s", sprint_hex(key,16));

-                                       ulc_print_3deskey(SwapEndian64(key,16));
+                                       uint8_t keySwap[16];
+                                       memcpy(keySwap, SwapEndian64(key,16,8), 16);
+                                       ulc_print_3deskey(keySwap);

                                        return 1;
                                }
                        }
                                        return 1;
                                }
                        }


@@ -984,7 +984,7 @@ int CmdHF14AMfUDump(const char *Cmd){
        if(errors) return usage_hf_mfu_dump();
        
        if (swapEndian)
        if(errors) return usage_hf_mfu_dump();
        
        if (swapEndian)

-               keyPtr = SwapEndian64(data, 16);
+               keyPtr = SwapEndian64(data, 16, 8);

 
        TagTypeUL_t tagtype = GetHF14AMfU_Type();
        if (tagtype == UL_ERROR) return -1;
 
        TagTypeUL_t tagtype = GetHF14AMfU_Type();
        if (tagtype == UL_ERROR) return -1;

diff --git a/client/util.c b/client/util.c
index 1c8081bf2370f342437ab2b16276cd5824dea2dd..391b9b00c7629e6e4239873ee7d8bbdfc9f9d441 100644 (file)
--- a/client/util.c
+++ b/client/util.c
@@ -164,14 +164,16 @@ uint64_t bytes_to_num(uint8_t* src, size_t len)
 // to
 // hh,gg,ff,ee,dd,cc,bb,aa, pp,oo,nn,mm,ll,kk,jj,ii
 // up to 64 bytes or 512 bits
 // to
 // hh,gg,ff,ee,dd,cc,bb,aa, pp,oo,nn,mm,ll,kk,jj,ii
 // up to 64 bytes or 512 bits

-uint8_t *SwapEndian64(uint8_t *src, size_t len){
-       static uint8_t temp[64]={0};
-       for (uint8_t block=0; block < (uint8_t)len/8; block++){
-               for (size_t i = 0; i < 8; i++){
-                       temp[i+(8*block)] = src[(7-i)+(8*block)];
+uint8_t *SwapEndian64(const uint8_t *src, const size_t len, const uint8_t blockSize){
+       static uint8_t buf[64];
+       memset(buf, 0x00, 64);
+       uint8_t *tmp = buf;
+       for (uint8_t block=0; block < (uint8_t)(len/blockSize); block++){
+               for (size_t i = 0; i < blockSize; i++){
+                       tmp[i+(blockSize*block)] = src[(blockSize-1-i)+(blockSize*block)];

                }
        }
                }
        }

-       return temp;
+       return tmp;

 }
 
 //assumes little endian
 }
 
 //assumes little endian

diff --git a/client/util.h b/client/util.h
index fb587da0ba76b40df206e9526ced33443345ce60..f58f64cb47200defd20fb82aa084bebd5dccf18e 100644 (file)
--- a/client/util.h
+++ b/client/util.h
@@ -44,7 +44,7 @@ char * sprint_bin_break(const uint8_t *data, const size_t len, const uint8_t bre
 void num_to_bytes(uint64_t n, size_t len, uint8_t* dest);
 uint64_t bytes_to_num(uint8_t* src, size_t len);
 char * printBits(size_t const size, void const * const ptr);
 void num_to_bytes(uint64_t n, size_t len, uint8_t* dest);
 uint64_t bytes_to_num(uint8_t* src, size_t len);
 char * printBits(size_t const size, void const * const ptr);

-uint8_t *SwapEndian64(uint8_t *src, size_t len);
+uint8_t *SwapEndian64(const uint8_t *src, const size_t len, const uint8_t blockSize);

 
 char param_getchar(const char *line, int paramnum);
 uint8_t param_get8(const char *line, int paramnum);
 
 char param_getchar(const char *line, int paramnum);
 uint8_t param_get8(const char *line, int paramnum);