Changeset 52b601e in OpenSC

Timestamp:

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

Author:

Peter Marschall <peter@…>

Branches:

master, staging

Children:

12fce0f

Parents:

81aa02d

git-author:

Peter Marschall <peter@…> (06/02/11 15:46:30)

git-committer:

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

Message:

opensc-explorer: re-factor do_apdu()

• allow double-quoted strings besides hexdata in ADPU generation
• detect errors in parameter parsing
• use utility function to print bytes sent, fixing an error that only showed parts of the APDU wheni it was generated from multiple arguments

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

File:

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

src/tools/opensc-explorer.c

@@ -165 +165 @@
                 "update binary"                         },
         { do_apdu,
-                "apdu", "<apdu:hex:codes:...>",
+                "apdu", "<data>+",
                 "send a custom apdu command"            },
         { do_asn1,
@@ -1347 +1347 @@
         u8 buf[SC_MAX_APDU_BUFFER_SIZE];
         u8 rbuf[SC_MAX_APDU_BUFFER_SIZE];
-        size_t len, len0, r, ii;
+        size_t len, r, i;
 
         if (argc < 1)
                 return usage(do_apdu);
 
-        for (ii = 0, len = 0; ii < (unsigned) argc; ii++)   {
-                len0 = strlen(argv[ii]);
-                sc_hex_to_bin(argv[ii], buf + len, &len0);
+        for (i = 0, len = 0; i < (unsigned) argc; i++)   {
+                size_t len0 = strlen(argv[i]);
+
+                if ((r = parse_string_or_hexdata(argv[i], buf + len, &len0)) < 0) {
+                        fprintf(stderr, "error parsing %s: %s\n", argv[i], sc_strerror(r));
+                        return r;
+                };
                 len += len0;
         }
@@ -1368 +1372 @@
 
         printf("Sending: ");
-        for (r = 0; r < len0; r++)
-                printf("%02X ", buf[r]);
+        util_hex_dump(stdout, buf, len, " ");
         printf("\n");
         r = sc_transmit_apdu(card, &apdu);