Fix a bug in the ambigious name detection.

Minor cleanups.

3 files changed, 40 insertions, 13 deletions

diff --git a/sm/ChangeLog b/sm/ChangeLog
index 603193ec7..44d304526 100644
--- a/sm/ChangeLog
+++ b/sm/ChangeLog
@@ -1,3 +1,15 @@
+2008-03-20  Werner Koch  <[email protected]>
+
+	* certlist.c (gpgsm_add_to_certlist): Always save the first
+	subject and issuer.  Initialize issuer with issuer and not with
+	subject.
+	(same_subject_issuer): Set issuer2 to issuer and not to subject.
+
+2008-03-17  Werner Koch  <[email protected]>
+
+	* certdump.c (my_funopen_hook_size_t): New.
+	(format_name_writer): Use it.
+
 2008-03-13  Werner Koch  <[email protected]>
 
 	* certdump.c (gpgsm_fpr_and_name_for_status): Fix signed/unsigned
diff --git a/sm/certdump.c b/sm/certdump.c
index 60df2bdc0..91539017f 100644
--- a/sm/certdump.c
+++ b/sm/certdump.c
@@ -41,8 +41,10 @@
 
 #ifdef HAVE_FOPENCOOKIE
 typedef ssize_t my_funopen_hook_ret_t;
+typedef size_t  my_funopen_hook_size_t;
 #else
 typedef int     my_funopen_hook_ret_t;
+typedef int     my_funopen_hook_size_t;
 #endif
 
 
@@ -778,7 +780,8 @@ struct format_name_cookie
 
 /* The writer function for the memory stream. */
 static my_funopen_hook_ret_t
-format_name_writer (void *cookie, const char *buffer, size_t size)
+format_name_writer (void *cookie, const char *buffer,
+                    my_funopen_hook_size_t size)
 {
   struct format_name_cookie *c = cookie;
   char *p;
@@ -792,14 +795,14 @@ format_name_writer (void *cookie, const char *buffer, size_t size)
       c->error = errno;
       xfree (c->buffer);
       errno = c->error;
-      return -1;
+      return (my_funopen_hook_ret_t)(-1);
     }
   c->buffer = p;
   memcpy (p + c->len, buffer, size);
   c->len += size;
   p[c->len] = 0; /* Terminate string. */ 
 
-  return size;
+  return (my_funopen_hook_ret_t)size;
 }
 #endif /*HAVE_FOPENCOOKIE || HAVE_FUNOPEN*/
 
diff --git a/sm/certlist.c b/sm/certlist.c
index 9574b8bdc..2b717ef8b 100644
--- a/sm/certlist.c
+++ b/sm/certlist.c
@@ -1,5 +1,6 @@
 /* certlist.c - build list of certificates
- * Copyright (C) 2001, 2003, 2004, 2005, 2007 Free Software Foundation, Inc.
+ * Copyright (C) 2001, 2003, 2004, 2005, 2007,
+ *               2008 Free Software Foundation, Inc.
  *
  * This file is part of GnuPG.
  *
@@ -213,7 +214,7 @@ static int
 same_subject_issuer (const char *subject, const char *issuer, ksba_cert_t cert)
 {
   char *subject2 = ksba_cert_get_subject (cert, 0);
-  char *issuer2 = ksba_cert_get_subject (cert, 0);
+  char *issuer2 = ksba_cert_get_issuer (cert, 0);
   int tmp;
   
   tmp = (subject && subject2
@@ -307,8 +308,8 @@ gpgsm_add_to_certlist (ctrl_t ctrl, const char *name, int secret,
       else
         {
           int wrong_usage = 0;
-          char *subject = NULL;
-          char *issuer = NULL;
+          char *first_subject = NULL;
+          char *first_issuer = NULL;
 
         get_next:
           rc = keydb_search (kh, &desc, 1);
@@ -316,6 +317,13 @@ gpgsm_add_to_certlist (ctrl_t ctrl, const char *name, int secret,
             rc = keydb_get_cert (kh, &cert);
           if (!rc)
             {
+              if (!first_subject)
+                {
+                  /* Save the the subject and the issuer for key usage
+                     and ambiguous name tests. */
+                  first_subject = ksba_cert_get_subject (cert, 0);
+                  first_issuer = ksba_cert_get_issuer (cert, 0);
+                }
               rc = secret? gpgsm_cert_use_sign_p (cert)
                          : gpgsm_cert_use_encrypt_p (cert);
               if (gpg_err_code (rc) == GPG_ERR_WRONG_KEY_USAGE)
@@ -325,13 +333,12 @@ gpgsm_add_to_certlist (ctrl_t ctrl, const char *name, int secret,
                   if (!wrong_usage)
                     { /* save the first match */
                       wrong_usage = rc;
-                      subject = ksba_cert_get_subject (cert, 0);
-                      issuer = ksba_cert_get_subject (cert, 0);
                       ksba_cert_release (cert);
                       cert = NULL;
                       goto get_next;
                     }
-                  else if (same_subject_issuer (subject, issuer, cert))
+                  else if (same_subject_issuer (first_subject, first_issuer,
+                                                cert))
                     {
                       wrong_usage = rc;
                       ksba_cert_release (cert);
@@ -375,7 +382,9 @@ gpgsm_add_to_certlist (ctrl_t ctrl, const char *name, int secret,
                      keybox).  */
                   if (!keydb_get_cert (kh, &cert2))
                     {
-                      int tmp = (same_subject_issuer (subject, issuer, cert2)
+                      int tmp = (same_subject_issuer (first_subject, 
+                                                      first_issuer, 
+                                                      cert2)
                                  && ((gpg_err_code (
                                       secret? gpgsm_cert_use_sign_p (cert2)
                                       : gpgsm_cert_use_encrypt_p (cert2)
@@ -398,8 +407,10 @@ gpgsm_add_to_certlist (ctrl_t ctrl, const char *name, int secret,
                 }
               gpgsm_release_certlist (dup_certs);
             }
-          xfree (subject);
-          xfree (issuer);
+          xfree (first_subject);
+          xfree (first_issuer);
+          first_subject = NULL;
+          first_issuer = NULL;
 
           if (!rc && !is_cert_in_certlist (cert, *listaddr))
             {
@@ -441,6 +452,7 @@ gpgsm_add_to_certlist (ctrl_t ctrl, const char *name, int secret,
   return rc == -1? gpg_error (GPG_ERR_NO_PUBKEY): rc;
 }
 
+
 void
 gpgsm_release_certlist (certlist_t list)
 {