Changeset 081bf9f in OpenSC

Timestamp:

06/11/11 07:33:30 (12 months ago)

Author:

Peter Marschall <peter@…>

Branches:

master, staging

Children:

aa7a5ae

Parents:

9c9317d

git-author:

Peter Marschall <peter@…> (06/02/11 13:39:12)

git-committer:

Peter Marschall <peter@…> (06/11/11 07:33:30)

Message:

opensc-explorer: consolidate string/hexdata parsing

• add new function parse_string_or_hexdata() that parses a double-quoted string or a hex-data string (e.g: AA:BB:CC) into a buffer
• use parse_string_or_hexdata() wherever strings or hexdata gets parsed into a buffer

Signed-off-by: Peter Marschall <peter@…>

File:

• src/tools/opensc-explorer.c (modified) (12 diffs)

src/tools/opensc-explorer.c

@@ -187 +187 @@
 
 
+static int parse_string_or_hexdata(const char *in, u8 *out, size_t *outlen)
+{
+        if (in == NULL)
+                return SC_ERROR_INVALID_ARGUMENTS;
+
+        if (*in == '"') {
+                u8 quote = *in++;
+                size_t count = 0;
+
+                while (*in != quote && *in != '\0' && count < *outlen)
+                        out[count++] = *in++;
+                if (*in == '\0')
+                        return SC_ERROR_INVALID_ARGUMENTS;
+                if (count >= *outlen)
+                        return SC_ERROR_BUFFER_TOO_SMALL;
+
+                *outlen = count;
+                return 0;
+        }
+        else
+                return sc_hex_to_bin(in, out, outlen);
+}
+
 static int usage(int (*func)(int, char **))
 {
@@ -774 +797 @@
         int r, tries_left = -1;
         u8 buf[64];
-        const char *s;
         size_t buflen = sizeof(buf), i;
         struct sc_pin_cmd_data data;
@@ -808 +830 @@
                 data.pin1.prompt = "Please enter PIN";
                 data.flags |= SC_PIN_CMD_USE_PINPAD;
-        } else if (argv[1][0] == '"') {
-                for (s=argv[1]+1, i=0; i < sizeof(buf) && *s && *s != '"';i++) 
-                        buf[i] = *s++;
-                data.pin1.data = buf;
-                data.pin1.len = i;
         } else {
-                r = sc_hex_to_bin(argv[1], buf, &buflen); 
+                r = parse_string_or_hexdata(argv[1], buf, &buflen);
                 if (0 != r) {
                         printf("Invalid key value.\n");
@@ -852 +869 @@
         u8 oldpin[30];
         u8 newpin[30];
-        const char *s;
-        size_t oldpinlen = sizeof(oldpin), i;
+        size_t oldpinlen = sizeof(oldpin);
         size_t newpinlen = sizeof(newpin);
 
@@ -877 +893 @@
                 oldpinlen = 0;
         } else {
-                if (argv[0][0] == '"') {
-                        for (s = argv[0] + 1, i = 0;
-                             i < sizeof(oldpin) && *s && *s != '"'; i++) 
-                                oldpin[i] = *s++;
-                        oldpinlen = i;
-                } else if (sc_hex_to_bin(argv[0], oldpin, &oldpinlen) != 0) {
+                if (parse_string_or_hexdata(argv[0], oldpin, &oldpinlen) != 0) {
                         printf("Invalid key value.\n");
                         goto usage;
@@ -891 +902 @@
 
         if (argc)   {
-                if (argv[0][0] == '"') {
-                        for (s = argv[0] + 1, i = 0;
-                             i < sizeof(newpin) && *s && *s != '"'; i++) 
-                                newpin[i] = *s++;
-                        newpinlen = i;
-                } else if (sc_hex_to_bin(argv[0], newpin, &newpinlen) != 0) {
+                if (parse_string_or_hexdata(argv[0], newpin, &newpinlen) != 0) {
                         printf("Invalid key value.\n");
                         goto usage;
@@ -933 +939 @@
         u8 puk_buf[30], *puk = NULL;
         u8 newpin_buf[30], *newpin = NULL;
-        const char *s;
-        size_t puklen = sizeof(puk_buf), i;
+        size_t puklen = sizeof(puk_buf);
         size_t newpinlen = sizeof(newpin_buf);
 
@@ -954 +959 @@
                 puk = NULL;
         } else {
-                if (argv[0][0] == '"') {
-                        for (s = argv[0] + 1, i = 0;
-                             i < sizeof(puk_buf) && *s && *s != '"'; i++) 
-                                puk_buf[i] = *s++;
-                        puklen = i;
-                } else if (sc_hex_to_bin(argv[0], puk_buf, &puklen) != 0) {
+                if (parse_string_or_hexdata(argv[0], puk_buf, &puklen) != 0) {
                         printf("Invalid key value.\n");
                         goto usage;
@@ -970 +970 @@
 
         if (argc)   {
-                if (argv[0][0] == '"') {
-                        for (s = argv[0] + 1, i = 0;
-                             i < sizeof(newpin_buf) && *s && *s != '"'; i++) 
-                                newpin_buf[i] = *s++;
-                        newpinlen = i;
-                } else if (sc_hex_to_bin(argv[0], newpin_buf, &newpinlen) != 0) {
+                if (parse_string_or_hexdata(argv[0], newpin_buf, &newpinlen) != 0) {
                         printf("Invalid key value.\n");
                         goto usage;
@@ -1130 +1125 @@
 {
         u8 buf[240];
-        int r, err = 1, in_len;
+        size_t buflen = sizeof(buf);
+        int r, err = 1;
         int offs;
         sc_path_t path;
@@ -1144 +1140 @@
         in_str = argv[2];
         printf("in: %i; %s\n", offs, in_str);
-        if (*in_str=='\"')   {
-                in_len = strlen(in_str)-2 >= sizeof(buf) ? sizeof(buf)-1 : strlen(in_str)-2;
-                strncpy((char *) buf, in_str+1, in_len);
-        } else {
-                in_len = hex2binary(buf, sizeof(buf), in_str);
-                if (!in_len) {
-                        printf("unable to parse hex value\n");
-                        return -1;
-                }
+
+        r = parse_string_or_hexdata(in_str, buf, &buflen);
+        if (r < 0) {
+                printf("unable to parse data\n");
+                return -1;
         }
 
@@ -1166 +1158 @@
         }
 
-        r = sc_update_binary(card, offs, buf, in_len, 0);
+        r = sc_update_binary(card, offs, buf, buflen, 0);
         if (r < 0) {
                 printf("Cannot update %04X; return %i\n", file->id, r);