From: merlokk <olegmsn@gmail.com>
Date: Tue, 31 Oct 2017 13:15:57 +0000 (+0200)
Subject: param parsing convert to procedures
X-Git-Tag: v3.1.0~133^2~19
X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/commitdiff_plain/8019540b19fe60be30a4a003727260892934a242

param parsing convert to procedures
---

diff --git a/client/cmdhf14a.c b/client/cmdhf14a.c
index c16a64bd..336cb0d2 100644
--- a/client/cmdhf14a.c
+++ b/client/cmdhf14a.c
@@ -556,17 +556,14 @@ int CmdHF14ASnoop(const char *Cmd) {
 
 int CmdHF14AAPDU(const char *cmd) {
 	uint8_t data[USB_CMD_DATA_SIZE];
-	uint16_t datalen = 0;
+	int datalen = 0;
 	uint8_t cmdc = 0;
-	char buf[5] = {0};
-	int i = 0;
-	uint32_t temp;
 	uint8_t first, second;
 	bool activateField = false;
 	bool leaveSignalON = false;
 	bool decodeTLV = false;
 	
-	if (strlen(cmd)<2) {
+	if (strlen(cmd) < 2) {
 		PrintAndLog("Usage: hf 14a apdu [-s] [-k] [-t] <APDU (hex)>");
 		PrintAndLog("       -s    activate field and select card");
 		PrintAndLog("       -k    leave the signal field ON after receive response");
@@ -574,13 +571,11 @@ int CmdHF14AAPDU(const char *cmd) {
 		return 0;
 	}
 
-	// strip
-	while (*cmd==' ' || *cmd=='\t') cmd++;
-
-	while (cmd[i]!='\0') {
-		if (cmd[i]==' ' || cmd[i]=='\t') { i++; continue; }
-		if (cmd[i]=='-') {
-			switch (cmd[i + 1]) {
+	int cmdp = 0;
+	while(param_getchar(cmd, cmdp) != 0x00) {
+		char c = param_getchar(cmd, cmdp);
+		if ((c == '-') && (param_getlength(cmd, cmdp) == 2))
+			switch (param_getchar_indx(cmd, 1, cmdp)) {
 				case 's':
 				case 'S':
 					activateField = true;
@@ -594,39 +589,29 @@ int CmdHF14AAPDU(const char *cmd) {
 					decodeTLV = true;
 					break;
 				default:
-					PrintAndLog("Invalid option");
+					PrintAndLog("Unknown parameter '%c'", param_getchar_indx(cmd, 1, cmdp));
 					return 1;
 			}
-			i += 2;
-			continue;
-		}
-		if ((cmd[i] >= '0' && cmd[i] <= '9') ||
-		    (cmd[i] >= 'a' && cmd[i] <= 'f') ||
-		    (cmd[i] >= 'A' && cmd[i] <= 'F') ) {
-			buf[strlen(buf) + 1] = 0x00;
-			buf[strlen(buf)] = cmd[i];
-			i++;
-
-			if (strlen(buf) >= 2) {
-				sscanf(buf, "%x", &temp);
-				data[datalen] = (uint8_t)(temp & 0xff);
-				*buf = 0;
-				if (datalen > sizeof(data) - 2) {
-					PrintAndLog("Buffer is full...");
-					break;
-				} else {
-					datalen++;
-				}
+			
+		if (isxdigit(c)) {
+			switch(param_gethex_to_eol(cmd, cmdp, data, sizeof(data), &datalen)) {
+			case 1:
+				PrintAndLog("Invalid HEX value.");
+				return 1;
+			case 2:
+				PrintAndLog("APDU too large.");
+				return 1;
+			case 3:
+				PrintAndLog("Hex must have even number of digits.");
+				return 1;
 			}
-			continue;
+			
+			// we get all the hex to end of line with spaces
+			break;
 		}
-		PrintAndLog("Invalid char on input");
-		return 1;
+		
+		cmdp++;
 	}
-	if (*buf) {
-		PrintAndLog("Hex must have even number of digits. Detected %d symbols.", datalen * 2 + strlen(buf));
-		return 1;
-	}		
 	
 	if (activateField)
 		cmdc |= ISO14A_CONNECT;
diff --git a/client/util.c b/client/util.c
index 8357f601..9dab4655 100644
--- a/client/util.c
+++ b/client/util.c
@@ -364,13 +364,19 @@ int param_getlength(const char *line, int paramnum)
 	return en - bg + 1;
 }
 
-char param_getchar(const char *line, int paramnum)
-{
+char param_getchar(const char *line, int paramnum) {
+	return param_getchar_indx(line, 0, paramnum);
+}
+
+char param_getchar_indx(const char *line, int indx, int paramnum) {
 	int bg, en;
 	
 	if (param_getptr(line, &bg, &en, paramnum)) return 0x00;
 
-	return line[bg];
+	if (bg + indx > en)
+		return '\0';
+	
+	return line[bg + indx];
 }
 
 uint8_t param_get8(const char *line, int paramnum)
@@ -480,6 +486,51 @@ int param_gethex_ex(const char *line, int paramnum, uint8_t * data, int *hexcnt)
 
 	return 0;
 }
+
+int param_gethex_to_eol(const char *line, int paramnum, uint8_t * data, int maxdatalen, int *datalen) {
+	int bg, en;
+	uint32_t temp;
+	char buf[5] = {0};
+
+	if (param_getptr(line, &bg, &en, paramnum)) return 1;
+
+	*datalen = 0;
+	
+	int indx = bg;
+	while (line[indx]) {
+		if (line[indx] == '\t' || line[indx] == ' ') 
+			continue;
+		
+		if (isxdigit(line[indx])) {
+			buf[strlen(buf) + 1] = 0x00;
+			buf[strlen(buf)] = line[indx];
+		} else {
+			// if we have symbols other than spaces and hex
+			return 1;
+		}				
+
+		if (*datalen >= maxdatalen) {
+			// if we dont have space in buffer and have symbols to translate
+			return 2;
+		}
+
+		if (strlen(buf) >= 2) {
+			sscanf(buf, "%x", &temp);
+			data[*datalen] = (uint8_t)(temp & 0xff);
+			*buf = 0;
+			(*datalen)++;
+		}
+		
+		indx++;
+	}
+
+	if (strlen(buf) > 0) 
+		//error when not completed hex bytes
+		return 3;
+		
+	return 0;
+}
+
 int param_getstr(const char *line, int paramnum, char * str)
 {
 	int bg, en;
diff --git a/client/util.h b/client/util.h
index d6ed7d17..f42625b1 100644
--- a/client/util.h
+++ b/client/util.h
@@ -53,6 +53,7 @@ extern void SwapEndian64ex(const uint8_t *src, const size_t len, const uint8_t b
 
 extern int param_getlength(const char *line, int paramnum);
 extern char param_getchar(const char *line, int paramnum);
+extern char param_getchar_indx(const char *line, int indx, int paramnum);
 extern int param_getptr(const char *line, int *bg, int *en, int paramnum);
 extern uint8_t param_get8(const char *line, int paramnum);
 extern uint8_t param_get8ex(const char *line, int paramnum, int deflt, int base);
@@ -62,6 +63,7 @@ extern uint8_t param_getdec(const char *line, int paramnum, uint8_t *destination
 extern uint8_t param_isdec(const char *line, int paramnum);
 extern int param_gethex(const char *line, int paramnum, uint8_t * data, int hexcnt);
 extern int param_gethex_ex(const char *line, int paramnum, uint8_t * data, int *hexcnt);
+extern int param_gethex_to_eol(const char *line, int paramnum, uint8_t * data, int maxdatalen, int *datalen);
 extern int param_getstr(const char *line, int paramnum, char * str);
 
 extern int hextobinarray( char *target,  char *source);