CHG: Script now also test to read block 0 via the chinese magic command if the normal...

[proxmark3-svn] / client / util.c

diff --git a/client/util.c b/client/util.c
index 0418dd98f9f6c4c35f7cc50962766e092011c6e2..edd9aebce96dec0a3de08dc7ad68798a9a8a0aaf 100644 (file)
--- a/client/util.c
+++ b/client/util.c
@@ -213,6 +213,7 @@ int param_getptr(const char *line, int *bg, int *en, int paramnum)
        return 0;
 }
 
+
 char param_getchar(const char *line, int paramnum)
 {
        int bg, en;
@@ -227,6 +228,35 @@ uint8_t param_get8(const char *line, int paramnum)
        return param_get8ex(line, paramnum, 10, 0);
 }
 
+/**
+ * @brief Reads a decimal integer (actually, 0-254, not 255)
+ * @param line
+ * @param paramnum
+ * @return -1 if error
+ */
+uint8_t param_getdec(const char *line, int paramnum, uint8_t *destination)
+{
+       uint8_t val =  param_get8ex(line, paramnum, 255, 10);
+       if( (int8_t) val == -1) return 1;
+       (*destination) = val;
+       return 0;
+}
+/**
+ * @brief Checks if param is decimal
+ * @param line
+ * @param paramnum
+ * @return
+ */
+uint8_t param_isdec(const char *line, int paramnum)
+{
+       int bg, en;
+       //TODO, check more thorougly
+       if (!param_getptr(line, &bg, &en, paramnum)) return 1;
+               //              return strtoul(&line[bg], NULL, 10) & 0xff;
+
+       return 0;
+}
+
 uint8_t param_get8ex(const char *line, int paramnum, int deflt, int base)
 {
        int bg, en;
@@ -372,7 +402,7 @@ void binarraytobinstring(char *target, char *source,  int length)
 }
 
 // return parity bit required to match type
-uint8_t parity( char *bits, uint8_t type, int length)
+uint8_t GetParity( char *bits, uint8_t type, int length)
 {
     int x;
 
@@ -386,8 +416,8 @@ uint8_t parity( char *bits, uint8_t type, int length)
 // add HID parity to binary array: EVEN prefix for 1st half of ID, ODD suffix for 2nd half
 void wiegand_add_parity(char *target, char *source, char length)
 {
-    *(target++)= parity(source, EVEN, length / 2);
+    *(target++)= GetParity(source, EVEN, length / 2);
     memcpy(target, source, length);
     target += length;
-    *(target)= parity(source + length / 2, ODD, length / 2);
+    *(target)= GetParity(source + length / 2, ODD, length / 2);
 }