* gpg-agent.c (handle_signal): Reload the trustlist on SIGHUP.

(start_connection_thread): Hack to simulate a ticker.
* trustlist.c (agent_trustlist_housekeeping)
(agent_reload_trustlist): New.  Protected all global functions
here with a simple counter which is sufficient for Pth.

* fingerprint.c (gpgsm_get_key_algo_info): New.
* sign.c (gpgsm_sign): Don't assume RSA in the status line.
* keylist.c (list_cert_colon): Really print the algorithm and key
length.
(list_cert_raw, list_cert_std): Ditto.
(list_cert_colon): Reorganized to be able to tell whether a root
certificate is trusted.

4 files changed, 106 insertions, 22 deletions

diff --git a/agent/ChangeLog b/agent/ChangeLog
index cf4ae79bf..ae1dd884e 100644
--- a/agent/ChangeLog
+++ b/agent/ChangeLog
@@ -1,3 +1,11 @@
+2004-05-11  Werner Koch  <[email protected]>
+
+	* gpg-agent.c (handle_signal): Reload the trustlist on SIGHUP.
+	(start_connection_thread): Hack to simulate a ticker.
+	* trustlist.c (agent_trustlist_housekeeping) 
+	(agent_reload_trustlist): New.  Protected all global functions
+	here with a simple counter which is sufficient for Pth.
+
 2004-05-03  Werner Koch  <[email protected]>
 
 	* gpg-agent.c: Remove help texts for options lile --lc-ctype.
diff --git a/agent/agent.h b/agent/agent.h
index 99fdc0547..6b7821e30 100644
--- a/agent/agent.h
+++ b/agent/agent.h
@@ -189,6 +189,8 @@ int agent_istrusted (const char *fpr);
 int agent_listtrusted (void *assuan_context);
 int agent_marktrusted (ctrl_t ctrl, const char *name,
                        const char *fpr, int flag);
+void agent_trustlist_housekeeping (void);
+void agent_reload_trustlist (void);
 
 
 /*-- divert-scd.c --*/
diff --git a/agent/gpg-agent.c b/agent/gpg-agent.c
index ad6ef33ea..8d21dc43c 100644
--- a/agent/gpg-agent.c
+++ b/agent/gpg-agent.c
@@ -1083,6 +1083,7 @@ handle_signal (int signo)
                 "re-reading configuration and flushing cache\n");
       agent_flush_cache ();
       reread_configuration ();
+      agent_reload_trustlist ();
       break;
       
     case SIGUSR1:
@@ -1129,6 +1130,12 @@ start_connection_thread (void *arg)
 
   if (opt.verbose)
     log_info ("handler for fd %d started\n", fd);
+
+  /* FIXME: Move this housekeeping into a ticker function.  Calling it
+     for each connection should work but won't work anymore if our
+     cleints start to keep connections. */
+  agent_trustlist_housekeeping ();
+
   start_command_handler (-1, fd);
   if (opt.verbose)
     log_info ("handler for fd %d terminated\n", fd);
diff --git a/agent/trustlist.c b/agent/trustlist.c
index 19de0708d..16b7dc34e 100644
--- a/agent/trustlist.c
+++ b/agent/trustlist.c
@@ -1,5 +1,5 @@
 /* trustlist.c - Maintain the list of trusted keys
- *	Copyright (C) 2002 Free Software Foundation, Inc.
+ *	Copyright (C) 2002, 2004 Free Software Foundation, Inc.
  *
  * This file is part of GnuPG.
  *
@@ -41,10 +41,13 @@ static const char headerblurb[] =
 "# with optional white spaces, followed by exactly 40 hex character,\n"
 "# optioanlly followed by a flag character which my either be 'P', 'S'\n"
 "# or '*'. Additional data delimited with by a white space is ignored.\n"
+"# NOTE: You should give the gpg-agent a HUP after editing this file.\n"
 "\n";
 
 
 static FILE *trustfp;
+static int   trustfp_used; /* Counter to track usage of TRUSTFP. */
+static int   reload_trustlist_pending;
 
 
 static int
@@ -164,7 +167,7 @@ read_list (char *key, int *keyflag)
   return 0;
 }
 
-/* check whether the given fpr is in our trustdb.  We expect FPR to be
+/* Check whether the given fpr is in our trustdb.  We expect FPR to be
    an all uppercase hexstring of 40 characters. */
 int 
 agent_istrusted (const char *fpr)
@@ -173,25 +176,31 @@ agent_istrusted (const char *fpr)
   static char key[41];
   int keyflag;
 
+  trustfp_used++;
   if (trustfp)
     rewind (trustfp);
   while (!(rc=read_list (key, &keyflag)))
     {
       if (!strcmp (key, fpr))
-        return 0;
+        {
+          trustfp_used--;
+          return 0;
+        }
     }
   if (rc != -1)
     {
-      /* error in the trustdb - close it to give the user a chance for
+      /* Error in the trustdb - close it to give the user a chance for
          correction */
-      fclose (trustfp);
+      if (trustfp)
+        fclose (trustfp);
       trustfp = NULL;
     }
+  trustfp_used--;
   return rc;
 }
 
 
-/* write all trust entries to FP */
+/* Write all trust entries to FP. */
 int 
 agent_listtrusted (void *assuan_context)
 {
@@ -199,6 +208,7 @@ agent_listtrusted (void *assuan_context)
   static char key[51];
   int keyflag;
 
+  trustfp_used++;
   if (trustfp)
     rewind (trustfp);
   while (!(rc=read_list (key, &keyflag)))
@@ -213,11 +223,13 @@ agent_listtrusted (void *assuan_context)
     rc = 0;
   if (rc)
     {
-      /* error in the trustdb - close it to give the user a chance for
+      /* Error in the trustdb - close it to give the user a chance for
          correction */
-      fclose (trustfp);
+      if (trustfp)
+        fclose (trustfp);
       trustfp = NULL;
     }
+  trustfp_used--;
   return rc;
 }
 
@@ -252,7 +264,7 @@ agent_marktrusted (CTRL ctrl, const char *name, const char *fpr, int flag)
     }    
   xfree (fname);
 
-
+  trustfp_used++;
   if (trustfp)
     rewind (trustfp);
   while (!(rc=read_list (key, &keyflag)))
@@ -260,14 +272,21 @@ agent_marktrusted (CTRL ctrl, const char *name, const char *fpr, int flag)
       if (!strcmp (key, fpr))
         return 0;
     }
-  fclose (trustfp);
+  if (trustfp)
+    fclose (trustfp);
   trustfp = NULL;
   if (rc != -1)
-    return rc;   /* error in the trustdb */
+    {
+      trustfp_used--;
+      return rc;   /* Error in the trustlist. */
+    }
 
   /* This feature must explicitly been enabled. */
   if (!opt.allow_mark_trusted)
-    return gpg_error (GPG_ERR_NOT_SUPPORTED);
+    {
+      trustfp_used--;
+      return gpg_error (GPG_ERR_NOT_SUPPORTED);
+    }
 
   /* insert a new one */
   if (asprintf (&desc,
@@ -275,42 +294,62 @@ agent_marktrusted (CTRL ctrl, const char *name, const char *fpr, int flag)
                 "  \"%s\"%%0A"
                 "has the fingerprint:%%0A"
                 "  %s", name, fpr) < 0 )
-    return out_of_core ();
+    {
+      trustfp_used--;
+      return out_of_core ();
+    }
   rc = agent_get_confirmation (ctrl, desc, "Correct", "No");
   free (desc);
   if (rc)
-    return rc;
+    {
+      trustfp_used--;
+      return rc;
+    }
 
   if (asprintf (&desc,
                 "Do you ultimately trust%%0A"
                 "  \"%s\"%%0A"
                 "to correctly certify user certificates?",
                 name) < 0 )
-    return out_of_core ();
+    {
+      trustfp_used--;
+      return out_of_core ();
+    }
   rc = agent_get_confirmation (ctrl, desc, "Yes", "No");
   free (desc);
   if (rc)
-    return rc;
+    {
+      trustfp_used--;
+      return rc;
+    }
 
-  /* now check again to avoid duplicates.  Also open in append mode now */
+  /* Now check again to avoid duplicates.  Also open in append mode now. */
   rc = open_list (1);
   if (rc)
-    return rc;
+    {
+      trustfp_used--;
+      return rc;
+    }
   rewind (trustfp);
   while (!(rc=read_list (key, &keyflag)))
     {
       if (!strcmp (key, fpr))
-        return 0;
+        {
+          trustfp_used--;
+          return 0;
+        }
     }
   if (rc != -1)
     {
-      fclose (trustfp);
+      if (trustfp)
+        fclose (trustfp);
       trustfp = NULL;
-      return rc;   /* error in the trustdb */
+      trustfp_used--;
+      return rc;   /* Error in the trustlist. */
     }
   rc = 0;
 
-  /* append the key */
+  /* Append the key. */
   fflush (trustfp);
   fputs ("\n# ", trustfp);
   print_sanitized_string (trustfp, name, 0);
@@ -322,5 +361,33 @@ agent_marktrusted (CTRL ctrl, const char *name, const char *fpr, int flag)
   if (fclose (trustfp))
     rc = gpg_error (gpg_err_code_from_errno (errno));
   trustfp = NULL;
+  trustfp_used--;
   return rc;
 }
+
+
+void
+agent_trustlist_housekeeping (void)
+{
+  if (reload_trustlist_pending && !trustfp_used)
+    {
+      if (trustfp)
+        {
+          fclose (trustfp);
+          trustfp = NULL;
+        }
+      reload_trustlist_pending = 0;
+    }
+}
+
+
+/* Not all editors are editing files in place, thus a changes
+   trustlist.txt won't be recognozed if we keep the file descriptor
+   open. This function may be used to explicitly close that file
+   descriptor, which will force a reopen in turn. */
+void
+agent_reload_trustlist (void)
+{
+  reload_trustlist_pending = 1;
+  agent_trustlist_housekeeping ();
+}