gnupg/g10 (ChangeLog Makefile.am keyserver.c)

[cvs user dshaw]

    Date: Wednesday, July 20, 2005 @ 23:15:04
  Author: dshaw
    Path: /cvs/gnupg/gnupg/g10

Modified: ChangeLog Makefile.am keyserver.c

* keyserver.c (curl_can_handle): New.  Do a runtime check against libcurl
to see if it can handle a particular protocol. (keyserver_typemap): Call
it here.

* Makefile.am: Pull in libcurl for curl_version_info() if used.


-------------+
 ChangeLog   |    8 ++++++++
 Makefile.am |    3 ++-
 keyserver.c |   48 +++++++++++++++++++++++++++++++++---------------
 3 files changed, 43 insertions(+), 16 deletions(-)


Index: gnupg/g10/ChangeLog
diff -u gnupg/g10/ChangeLog:1.765 gnupg/g10/ChangeLog:1.766
--- gnupg/g10/ChangeLog:1.765	Tue Jul 19 14:14:39 2005
+++ gnupg/g10/ChangeLog	Wed Jul 20 23:15:04 2005
@@ -1,3 +1,11 @@
+2005-07-20  David Shaw  <dshaw at jabberwocky.com>
+
+	* keyserver.c (curl_can_handle): New.  Do a runtime check against
+	libcurl to see if it can handle a particular protocol.
+	(keyserver_typemap): Call it here.
+
+	* Makefile.am: Pull in libcurl for curl_version_info() if used.
+
 2005-07-19  Werner Koch  <wk at g10code.com>
 
 	* g10.c, options.h: New option --limit-card-insert-tries.
Index: gnupg/g10/Makefile.am
diff -u gnupg/g10/Makefile.am:1.92 gnupg/g10/Makefile.am:1.93
--- gnupg/g10/Makefile.am:1.92	Tue May 31 10:39:17 2005
+++ gnupg/g10/Makefile.am	Wed Jul 20 23:15:04 2005
@@ -124,7 +124,8 @@
 	      verify.c          
 
 LDADD =  $(needed_libs) $(other_libs) @ZLIBS@ @W32LIBS@ @LIBREADLINE@
-gpg_LDADD = $(LDADD) @DLLIBS@ @NETLIBS@ @LIBUSB@
+gpg_LDADD = $(LDADD) @DLLIBS@ @NETLIBS@ @LIBUSB@ @LIBCURL@
+##gpg_CPPFLAGS = @LIBCURL_CPPFLAGS@
 
 $(PROGRAMS): $(needed_libs)
 
Index: gnupg/g10/keyserver.c
diff -u gnupg/g10/keyserver.c:1.88 gnupg/g10/keyserver.c:1.89
--- gnupg/g10/keyserver.c:1.88	Tue Jul 19 10:50:28 2005
+++ gnupg/g10/keyserver.c	Wed Jul 20 23:15:04 2005
@@ -25,6 +25,9 @@
 #include <string.h>
 #include <stdlib.h>
 #include <assert.h>
+#ifdef HAVE_LIBCURL
+#include <curl/curl.h>
+#endif
 #include "filter.h"
 #include "keydb.h"
 #include "status.h"
@@ -155,6 +158,10 @@
   m_free(keyserver);
 }
 
+/* TODO: once we cut over to an all-curl world, we don't need this
+   parser any longer so it can be removed, or at least moved to
+   keyserver/ksutil.c for limited use in gpgkeys_ldap or the like. */
+
 struct keyserver_spec *
 parse_keyserver_uri(const char *uri,int require_scheme,
 		    const char *configname,unsigned int configlineno)
@@ -822,6 +829,31 @@
   m_free(line);
 }
 
+static int
+curl_can_handle(const char *scheme)
+{
+#if defined(HAVE_LIBCURL)
+
+  const char * const *proto;
+  curl_version_info_data *data=curl_version_info(CURLVERSION_NOW);
+
+  assert(data);
+
+  for(proto=data->protocols;*proto;proto++)
+    if(strcasecmp(*proto,scheme)==0)
+      return 1;
+
+#elif defined(FAKE_CURL)
+
+  /* If we're faking curl, then we only support HTTP */
+  if(strcasecmp(scheme,"http")==0)
+    return 1;
+
+#endif
+
+  return 0;
+}
+
 /* We sometimes want to use a different gpgkeys_xxx for a given
    protocol (for example, ldaps is handled by gpgkeys_ldap).  Map
    these here. */
@@ -830,22 +862,8 @@
 {
   if(strcmp(type,"ldaps")==0)
     return "ldap";
-#ifdef FTP_VIA_LIBCURL
-  else if(strcmp(type,"ftp")==0)
-    return "curl";
-#endif
-#ifdef FTPS_VIA_LIBCURL
-  else if(strcmp(type,"ftps")==0)
+  else if(curl_can_handle(type))
     return "curl";
-#endif
-#ifdef HTTP_VIA_LIBCURL
-  else if(strcmp(type,"http")==0)
-    return "curl";
-#endif
-#ifdef HTTPS_VIA_LIBCURL
-  else if(strcmp(type,"https")==0)
-    return "curl";
-#endif
   else
     return type;
 }