From STABLE-BRANCH-1-4

* gpgkeys_curl.c (main): Use curl_version_info to verify that the
protocol we're about to use is actually available.

* curl-shim.h, curl-shim.c (curl_free): Make into a macro.
(curl_version_info): New.  Only advertises "http" for our shim, of
course.

1 files changed, 8 insertions, 3 deletions

diff --git a/keyserver/curl-shim.c b/keyserver/curl-shim.c
index 6c35c51d4..7d35320db 100644
--- a/keyserver/curl-shim.c
+++ b/keyserver/curl-shim.c
@@ -332,8 +332,13 @@ curl_escape(char *str,int length)
   return enc;
 }
 
-void
-curl_free(char *ptr)
+curl_version_info_data *
+curl_version_info(int type)
 {
-  free(ptr);
+  static curl_version_info_data data;
+  static const char *protocols[]={"http",NULL};
+
+  data.protocols=protocols;
+
+  return &data;
 }