Merge pull request #13 from k02a/patch-1

[proxmark3-svn] / client / cmdhf14b.c

diff --git a/client/cmdhf14b.c b/client/cmdhf14b.c
index cb93b1fc36e2017c00b8e27259e74bde2dde74fd..a328d03951a2530b310c14012cecff78e767ab0c 100644 (file)
--- a/client/cmdhf14b.c
+++ b/client/cmdhf14b.c
@@ -59,12 +59,14 @@ int usage_hf_14b_snoop(void){
        return 0;    
 }
 int usage_hf_14b_sim(void){
        return 0;    
 }
 int usage_hf_14b_sim(void){

-       PrintAndLog("Emulating ISO/IEC 14443 type B tag with 4 UID");
-       PrintAndLog("Usage: hf 14b sim [h]");
+       PrintAndLog("Emulating ISO/IEC 14443 type B tag with 4 UID / PUPI");
+       PrintAndLog("Usage: hf 14b sim [h] u <uid>");

        PrintAndLog("Options:");
        PrintAndLog("       h    this help");
        PrintAndLog("Options:");
        PrintAndLog("       h    this help");

+       PrintAndLog("       u    4byte UID/PUPI");

        PrintAndLog("sample:");
        PrintAndLog("       hf 14b sim");
        PrintAndLog("sample:");
        PrintAndLog("       hf 14b sim");

+       PrintAndLog("       hf 14b sim u 11223344");

        return 0;    
 }
 int usage_hf_14b_read_srx(void){
        return 0;    
 }
 int usage_hf_14b_read_srx(void){


@@ -111,10 +113,15 @@ int CmdHF14BList(const char *Cmd) {
 }
 
 int CmdHF14BSim(const char *Cmd) {
 }
 
 int CmdHF14BSim(const char *Cmd) {

-       char cmdp = param_getchar(Cmd, 0);
+       char cmdp = param_getchar(Cmd, 0);      

        if (cmdp == 'h' || cmdp == 'H') return usage_hf_14b_sim();
        
        if (cmdp == 'h' || cmdp == 'H') return usage_hf_14b_sim();
        

-       UsbCommand c = {CMD_SIMULATE_TAG_ISO_14443B, {0, 0, 0}};
+       uint32_t pupi = 0;
+       if (cmdp == 'u' || cmdp == 'U') {
+               pupi = param_get32ex(Cmd, 1, 0, 16);
+       }
+       
+       UsbCommand c = {CMD_SIMULATE_TAG_ISO_14443B, {pupi, 0, 0}};

        clearCommandBuffer();
        SendCommand(&c);
        return 0;
        clearCommandBuffer();
        SendCommand(&c);
        return 0;


@@ -848,24 +855,28 @@ bool waitCmd(bool verbose) {
 
     if (WaitForResponseTimeout(CMD_ACK, &resp, TIMEOUT)) {
 
 
     if (WaitForResponseTimeout(CMD_ACK, &resp, TIMEOUT)) {
 

-               status = (resp.arg[0] & 0xFFFF);
+               status = (resp.arg[0] & 0xFF);

                if ( status > 0 ) return FALSE;
                if ( status > 0 ) return FALSE;

-               
+                       

                len = (resp.arg[1] & 0xFFFF);
                len = (resp.arg[1] & 0xFFFF);

+               

                memcpy(data, resp.d.asBytes, len);
                
                if (verbose) {
                memcpy(data, resp.d.asBytes, len);
                
                if (verbose) {

-                       
-                       ComputeCrc14443(CRC_14443_B, data, len-2, &b1, &b2);
-                       crc = ( data[len-2] == b1 && data[len-1] == b2);
-                       
-                       PrintAndLog("[LEN %u] %s[%02X %02X] %s",
-                               len,
-                               sprint_hex(data, len-2),
-                               data[len-2],
-                               data[len-1],
-                               (crc) ? "OK" : "FAIL"
-                       );
+                       if ( len >= 3 ) {
+                               ComputeCrc14443(CRC_14443_B, data, len-2, &b1, &b2);
+                               crc = ( data[len-2] == b1 && data[len-1] == b2);
+               
+                               PrintAndLog("[LEN %u] %s[%02X %02X] %s",
+                                       len,
+                                       sprint_hex(data, len-2),
+                                       data[len-2],
+                                       data[len-1],
+                                       (crc) ? "OK" : "FAIL"
+                               );
+                       } else {
+                               PrintAndLog("[LEN %u] %s", len, sprint_hex(data, len) );
+                       }

                }       
                return TRUE;
     } else {
                }       
                return TRUE;
     } else {