From 34ccced8dcecc7220b0831674296bf26e6e3c9d4 Mon Sep 17 00:00:00 2001
From: David Shaw <dshaw@jabberwocky.com>
Date: Fri, 20 Feb 2004 20:18:49 +0000
Subject: [PATCH] * keyserver.c (keyserver_export): Disallow user strings that
 aren't key IDs. (keyserver_import): Clarify error message. (keyserver_spawn):
 Properly handle 8 bit characters in user IDs in the info lines during SEND.

---
 g10/ChangeLog   |  6 ++++++
 g10/keyserver.c | 42 +++++++++++++++++++++++++++++-------------
 2 files changed, 35 insertions(+), 13 deletions(-)

diff --git a/g10/ChangeLog b/g10/ChangeLog
index 71e006ccb..41a736f58 100644
--- a/g10/ChangeLog
+++ b/g10/ChangeLog
@@ -1,5 +1,11 @@
 2004-02-20  David Shaw  <dshaw@jabberwocky.com>
 
+	* keyserver.c (keyserver_export): Disallow user strings that
+	aren't key IDs.
+	(keyserver_import): Clarify error message.
+	(keyserver_spawn): Properly handle 8 bit characters in user IDs in
+	the info lines during SEND.
+
 	* mkdtemp.c: Removed.
 
 	* Makefile.am: We get mkdtemp.c from libutil.a now, so don't link
diff --git a/g10/keyserver.c b/g10/keyserver.c
index 163d3bae0..dd671bfea 100644
--- a/g10/keyserver.c
+++ b/g10/keyserver.c
@@ -899,7 +899,8 @@ keyserver_spawn(int action,STRLIST list,
 			    {
 			      if(uid->name[r]==':' || uid->name[r]=='%'
 				 || uid->name[r]&0x80)
-				fprintf(spawn->tochild,"%%%02X",uid->name[r]);
+				fprintf(spawn->tochild,"%%%02X",
+					(byte)uid->name[r]);
 			      else
 				fprintf(spawn->tochild,"%c",uid->name[r]);
 			    }
@@ -1142,18 +1143,33 @@ keyserver_work(int action,STRLIST list,KEYDB_SEARCH_DESC *desc,int count)
 int 
 keyserver_export(STRLIST users)
 {
-  /* We better ask for confirmation when the user entered --send-keys
-     without arguments.  Sending all keys might not be the thing he
-     intended to do */
-  if (users || opt.batch || opt.answer_yes)
-    ;
-  else if ( !cpr_get_answer_is_yes
-            ("keyserver_export.send_all",
-             _("Do you really want to send all your "
-               "public keys to the keyserver? (y/N) ")))
-    return -1;
+  STRLIST sl=NULL;
+  KEYDB_SEARCH_DESC desc;
+  int rc=0;
 
-  return keyserver_work(SEND,users,NULL,0);
+  /* Weed out descriptors that we don't support sending */
+  for(;users;users=users->next)
+    {
+      classify_user_id (users->d, &desc);
+      if(desc.mode!=KEYDB_SEARCH_MODE_SHORT_KID &&
+	 desc.mode!=KEYDB_SEARCH_MODE_LONG_KID &&
+	 desc.mode!=KEYDB_SEARCH_MODE_FPR16 &&
+	 desc.mode!=KEYDB_SEARCH_MODE_FPR20)
+	{
+	  log_error(_("\"%s\" not a key ID: skipping\n"),users->d);
+	  continue;
+	}
+      else
+	append_to_strlist(&sl,users->d);
+    }
+
+  if(sl)
+    {
+      rc=keyserver_work(SEND,sl,NULL,0);
+      free_strlist(sl);
+    }
+
+  return rc;
 }
 
 int 
@@ -1174,7 +1190,7 @@ keyserver_import(STRLIST users)
 	 desc[count].mode!=KEYDB_SEARCH_MODE_FPR16 &&
 	 desc[count].mode!=KEYDB_SEARCH_MODE_FPR20)
 	{
-	  log_error(_("skipping invalid key ID \"%s\"\n"),users->d);
+	  log_error(_("\"%s\" not a key ID: skipping\n"),users->d);
 	  continue;
 	}