* base64.c (base64_reader_cb): Try to detect an S/MIME body part.

* certdump.c (print_sexp): Renamed to gpgsm_dump_serial, made
global.
(print_time): Renamed to gpgsm_dump_time, made global.
(gpgsm_dump_serial): Take a real S-Expression as argument and
print the first item.
* keylist.c (list_cert_colon): Ditto.
* keydb.c (keydb_search_issuer_sn): Ditto.
* decrypt.c (print_integer_sexp): Removed and made callers
use gpgsm_dump_serial.
* verify.c (print_time): Removed, made callers use gpgsm_dump_time.

1 files changed, 9 insertions, 5 deletions

diff --git a/sm/keylist.c b/sm/keylist.c
index 07844fed1..f4c90939f 100644
--- a/sm/keylist.c
+++ b/sm/keylist.c
@@ -150,11 +150,15 @@ list_cert_colon (KsbaCert cert, FILE *fp)
       int len;
       const unsigned char *s = sexp;
       
-      for (len=0; *s && *s != ':' && digitp (s); s++)
-        len = len*10 + atoi_1 (s);
-      if (*s == ':')
-        for (s++; len; len--, s++)
-          fprintf (fp,"%02X", *s);
+      if (*s == '(')
+        {
+          s++;
+          for (len=0; *s && *s != ':' && digitp (s); s++)
+            len = len*10 + atoi_1 (s);
+          if (*s == ':')
+            for (s++; len; len--, s++)
+              fprintf (fp,"%02X", *s);
+        }
       xfree (sexp);
     }
   putc (':', fp);