security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2024-12-22 10:19:57 +01:00
Code Activity

* gpgkeys_curl.c (main): Only allow specified protocols to use the

Browse Source 
curl handler.

* Makefile.am: Use LIBCURL_CPPFLAGS instead of LIBCURL_INCLUDES.
This commit is contained in:
David Shaw 2005-01-18 04:24:52 +00:00
parent 586be6711e
commit 8220c9e799
3 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
keyserver/ChangeLog
View File

@ -1,3 +1,10 @@
2005-01-17 David Shaw <dshaw@grover.jabberwocky.com>
* gpgkeys_curl.c (main): Only allow specified protocols to use the
curl handler.
* Makefile.am: Use LIBCURL_CPPFLAGS instead of LIBCURL_INCLUDES.
2005-01-13 David Shaw <dshaw@jabberwocky.com> 2005-01-13 David Shaw <dshaw@jabberwocky.com>
* ksutil.h, gpgkeys_curl.c, gpgkeys_hkp.c, gpgkeys_ldap.c, * ksutil.h, gpgkeys_curl.c, gpgkeys_hkp.c, gpgkeys_ldap.c,

2
keyserver/Makefile.am
View File

@ -39,5 +39,5 @@ gpgkeys_ldap_LDADD = ../util/libutil.a @LDAPLIBS@ @NETLIBS@ $(other_libs) @GETOP
gpgkeys_hkp_LDADD = ../util/libutil.a @NETLIBS@ @SRVLIBS@ $(other_libs) @GETOPT@ @W32LIBS@ gpgkeys_hkp_LDADD = ../util/libutil.a @NETLIBS@ @SRVLIBS@ $(other_libs) @GETOPT@ @W32LIBS@
gpgkeys_http_LDADD = ../util/libutil.a @NETLIBS@ @SRVLIBS@ $(other_libs) @GETOPT@ @W32LIBS@ gpgkeys_http_LDADD = ../util/libutil.a @NETLIBS@ @SRVLIBS@ $(other_libs) @GETOPT@ @W32LIBS@
gpgkeys_finger_LDADD = ../util/libutil.a @NETLIBS@ $(other_libs) @GETOPT@ @W32LIBS@ gpgkeys_finger_LDADD = ../util/libutil.a @NETLIBS@ $(other_libs) @GETOPT@ @W32LIBS@
gpgkeys_curl_CPPFLAGS = @LIBCURL_INCLUDES@ gpgkeys_curl_CPPFLAGS = @LIBCURL_CPPFLAGS@
gpgkeys_curl_LDADD = @LIBCURL@ @GETOPT@ gpgkeys_curl_LDADD = @LIBCURL@ @GETOPT@

17
keyserver/gpgkeys_curl.c
View File

@ -292,20 +292,23 @@ main(int argc,char *argv[])
fprintf(console,"gpgkeys: no scheme supplied!\n"); fprintf(console,"gpgkeys: no scheme supplied!\n");
return KEYSERVER_SCHEME_NOT_FOUND; return KEYSERVER_SCHEME_NOT_FOUND;
} }
#ifndef HTTP_VIA_LIBCURL #ifdef HTTP_VIA_LIBCURL
else if(strcasecmp(scheme,"http")==0) else if(strcasecmp(scheme,"http")==0)
{ ;
fprintf(console,"gpgkeys: scheme `%s' not supported\n",scheme);
return KEYSERVER_SCHEME_NOT_FOUND;
}
#endif /* HTTP_VIA_LIBCURL */ #endif /* HTTP_VIA_LIBCURL */
#ifndef FTP_VIA_LIBCURL #ifdef HTTPS_VIA_LIBCURL
else if(strcasecmp(scheme,"https")==0)
;
#endif /* HTTP_VIA_LIBCURL */
#ifdef FTP_VIA_LIBCURL
else if(strcasecmp(scheme,"ftp")==0) else if(strcasecmp(scheme,"ftp")==0)
;
#endif /* FTP_VIA_LIBCURL */
else
{ {
fprintf(console,"gpgkeys: scheme `%s' not supported\n",scheme); fprintf(console,"gpgkeys: scheme `%s' not supported\n",scheme);
return KEYSERVER_SCHEME_NOT_FOUND; return KEYSERVER_SCHEME_NOT_FOUND;
} }
#endif /* FTP_VIA_LIBCURL */
if(timeout && register_timeout()==-1) if(timeout && register_timeout()==-1)
{ {