diff options
| author | Werner Koch <wk@gnupg.org> | 2009-07-01 20:30:33 +0200 |
|---|---|---|
| committer | Werner Koch <wk@gnupg.org> | 2009-07-01 20:30:33 +0200 |
| commit | 1925cb37f9cad721ff7ca228dab3ba214a14f767 (patch) | |
| tree | c7885e9f57ecbeeae49e3c4b45581c5db5e9024e /tools | |
| parent | Add comment about Cherry. (diff) | |
| download | gnupg2-1925cb37f9cad721ff7ca228dab3ba214a14f767.tar.xz gnupg2-1925cb37f9cad721ff7ca228dab3ba214a14f767.zip | |
Alow batch ode for gpgsm --gen-key.
Allow CSR generation using an existing key with gpgsm.
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/ChangeLog | 4 | ||||
| -rw-r--r-- | tools/ccidmon.c | 10 |
2 files changed, 9 insertions, 5 deletions
diff --git a/tools/ChangeLog b/tools/ChangeLog index 3faaf18f4..5f716e320 100644 --- a/tools/ChangeLog +++ b/tools/ChangeLog @@ -1,3 +1,7 @@ +2009-06-30 Werner Koch <wk@g10code.com> + + * ccidmon.c (parse_line_sniffusb): Take also TAB as delimiter. + 2009-06-29 Werner Koch <wk@g10code.com> * ccidmon.c (parse_line_sniffusb): New. diff --git a/tools/ccidmon.c b/tools/ccidmon.c index 4c373061e..b8546407e 100644 --- a/tools/ccidmon.c +++ b/tools/ccidmon.c @@ -702,13 +702,13 @@ parse_line_sniffusb (char *line, unsigned int lineno) if (debug) printf ("line[%u] =`%s'\n", lineno, line); - p = strtok (line, " "); + p = strtok (line, " \t"); if (!p) return; - p = strtok (NULL, " "); + p = strtok (NULL, " \t"); if (!p) return; - p = strtok (NULL, " "); + p = strtok (NULL, " \t"); if (!p) return; @@ -720,7 +720,7 @@ parse_line_sniffusb (char *line, unsigned int lineno) unsigned int value; length = databuffer.count; - while ((p=strtok (NULL, " "))) + while ((p=strtok (NULL, " \t"))) { if (!hexdigitp (p[0]) || !hexdigitp (p[1])) { @@ -745,7 +745,7 @@ parse_line_sniffusb (char *line, unsigned int lineno) flush_data (); *databuffer.address = 0; - while ((p=strtok (NULL, " (,)"))) + while ((p=strtok (NULL, " \t(,)"))) { if (!strcmp (p, "USBD_TRANSFER_DIRECTION_IN")) { |