gnupg/g10 (ChangeLog keyserver.c sign.c)

[cvs user dshaw]

    Date: Sunday, April 17, 2005 @ 06:10:03
  Author: dshaw
    Path: /cvs/gnupg/gnupg/g10

Modified: ChangeLog keyserver.c sign.c

* keyserver.c (keyserver_spawn): Free some memory.

* sign.c (hash_for): Comments.


-------------+
 ChangeLog   |    6 ++++++
 keyserver.c |   12 +++++++++++-
 sign.c      |   14 ++++++++++++++
 3 files changed, 31 insertions(+), 1 deletion(-)


Index: gnupg/g10/ChangeLog
diff -u gnupg/g10/ChangeLog:1.721 gnupg/g10/ChangeLog:1.722
--- gnupg/g10/ChangeLog:1.721	Mon Apr 11 20:24:09 2005
+++ gnupg/g10/ChangeLog	Sun Apr 17 06:10:03 2005
@@ -1,3 +1,9 @@
+2005-04-16  David Shaw  <dshaw at jabberwocky.com>
+
+	* keyserver.c (keyserver_spawn): Free some memory.
+
+	* sign.c (hash_for): Comments.
+
 2005-04-11  Werner Koch  <wk at g10code.com>
 
 	* g10.c (main, add_notation_data, add_policy_url)
Index: gnupg/g10/keyserver.c
diff -u gnupg/g10/keyserver.c:1.85 gnupg/g10/keyserver.c:1.86
--- gnupg/g10/keyserver.c:1.85	Mon Apr 11 20:24:09 2005
+++ gnupg/g10/keyserver.c	Sun Apr 17 06:10:03 2005
@@ -800,6 +800,14 @@
     }
 
  notfound:
+  /* Leave this commented out or now, and perhaps for a very long
+     time.  All HKPish servers return HTML error messages for
+     no-key-found. */
+  /* 
+     if(!started)
+     log_info(_("keyserver does not support searching\n"));
+     else
+  */
   if(count==0)
     {
       if(localstr)
@@ -851,7 +859,7 @@
   int ret=0,i,gotversion=0,outofband=0;
   STRLIST temp;
   unsigned int maxlen,buflen;
-  char *command=NULL,*searchstr=NULL;
+  char *command,*searchstr=NULL;
   byte *line=NULL;
   struct parse_options *kopts;
   struct exec_info *spawn;
@@ -920,6 +928,8 @@
   else
     ret=exec_write(&spawn,command,NULL,NULL,0,0);
 
+  m_free(command);
+
   if(ret)
     return ret;
 
Index: gnupg/g10/sign.c
diff -u gnupg/g10/sign.c:1.135 gnupg/g10/sign.c:1.136
--- gnupg/g10/sign.c:1.135	Thu Nov  4 23:28:39 2004
+++ gnupg/g10/sign.c	Sun Apr 17 06:10:03 2005
@@ -391,6 +391,20 @@
     return rc;
 }
 
+/*
+  First try --digest-algo.  If that isn't set, see if the recipient
+  has a preferred algorithm (which is also filtered through
+  --preferred-digest-prefs).  If we're making a signature without a
+  particular recipient (i.e. signing, rather than signing+encrypting)
+  then take the first algorithm in --preferred-digest-prefs that is
+  usable for the pubkey algorithm.  If --preferred-digest-prefs isn't
+  set, then take the OpenPGP default (i.e. SHA-1).
+
+  Possible improvement: Use the highest-ranked usable algorithm from
+  the signing key prefs either before or after using the personal
+  list?
+*/
+
 static int
 hash_for(int pubkey_algo, int packet_version )
 {