* app-dinsig.c: Implemented. Based on app-nks.c and card-dinsig.c

* app-nks.c (get_length_of_cert): Removed.
* app-help.c: New.
(app_help_read_length_of_cert): New.  Code taken from above.  New
optional arg R_CERTOFF.

* card-dinsig.c: Removed.
* card.c (card_get_serial_and_stamp): Do not bind to the old and
never finsiged card-dinsig.c.

* iso7816.c (iso7816_read_binary): Allow for an NMAX > 254.

1 files changed, 157 insertions, 0 deletions

diff --git a/scd/app-help.c b/scd/app-help.c
new file mode 100644
index 000000000..c6695635f
--- /dev/null
+++ b/scd/app-help.c
@@ -0,0 +1,157 @@
+/* app-help.c - Application helper functions
+ *	Copyright (C) 2004 Free Software Foundation, Inc.
+ *
+ * This file is part of GnuPG.
+ *
+ * GnuPG is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * GnuPG is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ */
+
+#include <config.h>
+#include <errno.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "scdaemon.h"
+#include "app-common.h"
+#include "iso7816.h"
+#include "tlv.h"
+
+/* Return the KEYGRIP for the certificate CERT as an hex encoded
+   string in the user provided buffer HEXKEYGRIP which must be of at
+   least 41 bytes. */
+gpg_error_t
+app_help_get_keygrip_string (ksba_cert_t cert, char *hexkeygrip)
+{
+  gpg_error_t err;
+  gcry_sexp_t s_pkey;
+  ksba_sexp_t p;
+  size_t n;
+  unsigned char array[20];
+  int i;
+
+  p = ksba_cert_get_public_key (cert);
+  if (!p)
+    return gpg_error (GPG_ERR_BUG);
+  n = gcry_sexp_canon_len (p, 0, NULL, NULL);
+  if (!n)
+    return gpg_error (GPG_ERR_INV_SEXP);
+  err = gcry_sexp_sscan (&s_pkey, NULL, p, n);
+  xfree (p);
+  if (err)
+    return err; /* Can't parse that S-expression. */
+  if (!gcry_pk_get_keygrip (s_pkey, array))
+    {
+      gcry_sexp_release (s_pkey);
+      return gpg_error (GPG_ERR_GENERAL); /* Failed to calculate the keygrip.*/
+    }
+  gcry_sexp_release (s_pkey);
+
+  for (i=0; i < 20; i++)
+    sprintf (hexkeygrip+i*2, "%02X", array[i]);
+
+  return 0;
+}
+
+
+
+/* Given the SLOT and the File ID FID, return the length of the
+   certificate contained in that file. Returns 0 if the file does not
+   exists or does not contain a certificate.  If R_CERTOFF is not
+   NULL, the length the header will be stored at this address; thus to
+   parse the X.509 certificate a read should start at that offset.
+
+   On success the file is still selected.
+*/
+size_t
+app_help_read_length_of_cert (int slot, int fid, size_t *r_certoff)
+{
+  gpg_error_t err;
+  unsigned char *buffer;
+  const unsigned char *p;
+  size_t buflen, n;
+  int class, tag, constructed, ndef;
+  size_t resultlen, objlen, hdrlen;
+
+  err = iso7816_select_file (slot, fid, 0, NULL, NULL);
+  if (err)
+    {
+      log_info ("error selecting FID 0x%04X: %s\n", fid, gpg_strerror (err));
+      return 0;
+    }
+
+  err = iso7816_read_binary (slot, 0, 32, &buffer, &buflen);
+  if (err)
+    {
+      log_info ("error reading certificate from FID 0x%04X: %s\n",
+                 fid, gpg_strerror (err));
+      return 0;
+    }
+  
+  if (!buflen || *buffer == 0xff)
+    {
+      log_info ("no certificate contained in FID 0x%04X\n", fid);
+      xfree (buffer);
+      return 0;
+    }
+
+  p = buffer;
+  n = buflen;
+  err = parse_ber_header (&p, &n, &class, &tag, &constructed,
+                          &ndef, &objlen, &hdrlen);
+  if (err)
+    {
+      log_info ("error parsing certificate in FID 0x%04X: %s\n",
+                fid, gpg_strerror (err));
+      xfree (buffer);
+      return 0;
+    }
+
+  /* All certificates should commence with a SEQUENCE except for the
+     special ROOT CA which are enclosed in a SET. */
+  if ( !(class == CLASS_UNIVERSAL &&  constructed
+         && (tag == TAG_SEQUENCE || tag == TAG_SET)))
+    {
+      log_info ("contents of FID 0x%04X does not look like a certificate\n",
+                fid);
+      return 0;
+    }
+
+  resultlen = objlen + hdrlen;
+  if (r_certoff)
+    {
+      /* The callers want the offset to the actual certificate. */
+      *r_certoff = hdrlen;
+
+      err = parse_ber_header (&p, &n, &class, &tag, &constructed,
+                              &ndef, &objlen, &hdrlen);
+      if (err)
+        return 0;
+
+      if (class == CLASS_UNIVERSAL && tag == TAG_OBJECT_ID && !constructed)
+        {
+          /* The certificate seems to be contained in a
+             userCertificate container.  Assume the following sequence
+             is the certificate. */
+          *r_certoff += hdrlen + objlen;
+          if (*r_certoff > resultlen)
+            return 0; /* That should never happen. */
+        }
+    }
+
+  return resultlen;
+}
+
+