X-Git-Url: http://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/95e635947bc4628b713fa00d7a533a881bca7fc4..cb8c358f4d31fdc7a388136c7036d57ec431c7ca:/client/cmdhf14b.c

diff --git a/client/cmdhf14b.c b/client/cmdhf14b.c
index 2c4c5949..a6cf7d57 100644
--- a/client/cmdhf14b.c
+++ b/client/cmdhf14b.c
@@ -13,10 +13,11 @@
 #include <stdbool.h>
 #include <string.h>
 #include <stdint.h>
-#include "../common/iso14443crc.h"
+#include "iso14443crc.h"
 #include "proxmark3.h"
 #include "data.h"
 #include "graph.h"
+#include "util.h"
 #include "ui.h"
 #include "cmdparser.h"
 #include "cmdhf14b.h"
@@ -274,12 +275,12 @@ int CmdHF14BCmdRaw (const char *cmd) {
     UsbCommand resp;
     uint8_t *recv;
     UsbCommand c = {CMD_ISO_14443B_COMMAND, {0, 0, 0}}; // len,recv?
-    uint8_t reply=1;
-    uint8_t crc=0;
-    uint8_t power=0;
-    char buf[5]="";
-    int i=0;
-    uint8_t data[100];
+    uint8_t reply = 1;
+    uint8_t crc = 0;
+    uint8_t power = 0;
+    char buf[5] = "";
+    int i = 0;
+    uint8_t data[100] = {0x00};
     unsigned int datalen=0, temp;
     char *hexout;
     
@@ -300,15 +301,15 @@ int CmdHF14BCmdRaw (const char *cmd) {
             switch (cmd[i+1]) {
                 case 'r': 
                 case 'R': 
-                    reply=0;
+                    reply = 0;
                     break;
                 case 'c':
                 case 'C':                
-                    crc=1;
+                    crc = 1;
                     break;
                 case 'p': 
                 case 'P': 
-                    power=1;
+                    power = 1;
                     break;
                 default:
                     PrintAndLog("Invalid option");
@@ -333,15 +334,15 @@ int CmdHF14BCmdRaw (const char *cmd) {
             continue;
         }
         PrintAndLog("Invalid char on input");
-        return 0;
+        return 1;
     }
-    if (datalen == 0)
-    {
+	
+    if (datalen == 0) {
       PrintAndLog("Missing data input");
-      return 0;
+      return 1;
     }
-    if(crc)
-    {
+	
+    if(crc) {
         uint8_t first, second;
         ComputeCrc14443(CRC_14443_B, data, datalen, &first, &second);
         data[datalen++] = first;
@@ -356,7 +357,7 @@ int CmdHF14BCmdRaw (const char *cmd) {
     SendCommand(&c);
     
     if (reply) {
-        if (WaitForResponseTimeout(CMD_ACK,&resp,10000)) {
+        if (WaitForResponseTimeout(CMD_ACK,&resp,1000)) {
             recv = resp.d.asBytes;
             PrintAndLog("received %i octets",resp.arg[0]);
             if(!resp.arg[0])
@@ -403,20 +404,27 @@ int CmdHF14BWrite( const char *Cmd){
 	bool isSrix4k = true;
 	char str[20];	
 
-	if (cmdp == 'h' || cmdp == 'H') {
+	if (strlen(Cmd) < 1 || cmdp == 'h' || cmdp == 'H') {
 		PrintAndLog("Usage:  hf 14b write <1|2> <BLOCK> <DATA>");
-		PrintAndLog("");
-		PrintAndLog("     sample: hf 14b write 1 127 11223344");
-		PrintAndLog("     sample: hf 14b write 1 255 11223344");
-		PrintAndLog("     sample: hf 14b write 2 15 11223344");
-		PrintAndLog("     sample: hf 14b write 2 255 11223344");
+		PrintAndLog("    [1 = SRIX4K]");
+		PrintAndLog("    [2 = SRI512]");
+		PrintAndLog("    [BLOCK number depends on tag, special block == FF]");
+		PrintAndLog("     sample: hf 14b write 1 7F 11223344");
+		PrintAndLog("           : hf 14b write 1 FF 11223344");
+		PrintAndLog("           : hf 14b write 2 15 11223344");
+		PrintAndLog("           : hf 14b write 2 FF 11223344");
 		return 0;
 	}
 
-	if ( param_getchar(Cmd, 0) == '2' )
+	if ( cmdp == '2' )
 		isSrix4k = false;
 	
-	blockno = param_get8(Cmd, 1);
+	//blockno = param_get8(Cmd, 1);
+	
+	if ( param_gethex(Cmd,1, &blockno, 2) ) {
+		PrintAndLog("Block number must include 2 HEX symbols");
+		return 0;
+	}
 	
 	if ( isSrix4k ){
 		if ( blockno > 0x7f && blockno != 0xff ){
@@ -436,11 +444,12 @@ int CmdHF14BWrite( const char *Cmd){
 	}
  
 	if ( blockno == 0xff)
-		PrintAndLog("Writing to special block %02X [ %s]", blockno,  sprint_hex(data,4) );
+		PrintAndLog("[%s] Write special block %02X [ %s ]", (isSrix4k)?"SRIX4K":"SRI512" , blockno,  sprint_hex(data,4) );
 	else
-		PrintAndLog("Writing to block %02X [ %s]", blockno,  sprint_hex(data,4) );
+		PrintAndLog("[%s] Write block %02X [ %s ]", (isSrix4k)?"SRIX4K":"SRI512", blockno,  sprint_hex(data,4) );
  
-	sprintf(str, "-c -p 09 %02x %02x%02x%02x%02x", blockno, data[0], data[1], data[2], data[3]);
+	sprintf(str, "-c 09 %02x %02x%02x%02x%02x", blockno, data[0], data[1], data[2], data[3]);
+
 	CmdHF14BCmdRaw(str);
 	return 0;
 }