security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-07-02 22:46:30 +02:00
Code Activity

* Makefile.am: No need to link with curl any longer.

Browse source 
* main.h, misc.c (path_access): New.  Same as access() but does a PATH
search like execlp.

* keyserver.c (curl_can_handle): Removed.  Replaced by...
(curl_cant_handle): We are now relying on curl as the handler of last
resort.  This is necessary because PGP LDAP and curl LDAP are apples
and oranges.  (keyserver_typemap): Only test for ldap and ldaps.
(keyserver_spawn): If a given handler is unusable (as determined by
path_access()) then try gpgkeys_curl.
This commit is contained in:
David Shaw 2005-08-21 20:58:46 +00:00
parent 2e8c02b54b
commit 24adfe678d
5 changed files with 84 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

65
g10/keyserver.c
View file

@ -49,6 +49,16 @@
#define GPGKEYS_PREFIX "gpgkeys_"
#if defined(HAVE_LIBCURL) || defined(FAKE_CURL)
#define GPGKEYS_CURL "gpgkeys_curl"
#endif
#ifdef GPGKEYS_CURL
#define GPGKEYS_PREFIX_LEN (strlen(GPGKEYS_PREFIX)+strlen(GPGKEYS_CURL))
#else
#define GPGKEYS_PREFIX_LEN (strlen(GPGKEYS_PREFIX))
#endif
struct keyrec
{
KEYDB_SEARCH_DESC desc;
@ -830,47 +840,29 @@ keyserver_search_prompt(IOBUF buffer,const char *searchstr)
xfree(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. */
static const char *
keyserver_typemap(const char *type)
{
if(strcmp(type,"ldap")==0)
if(strcmp(type,"ldaps")==0)
return "ldap";
else if(strcmp(type,"ldaps")==0)
return "ldap";
else if(curl_can_handle(type))
return "curl";
else
return type;
}
#ifdef GPGKEYS_CURL
static int
curl_cant_handle(const char *scheme)
{
if(strcmp(scheme,"ldap")==0 || strcmp(scheme,"ldaps")==0)
return 1;
return 0;
}
#endif
#define KEYSERVER_ARGS_KEEP " -o \"%O\" \"%I\""
#define KEYSERVER_ARGS_NOKEEP " -o \"%o\" \"%i\""
@ -881,7 +873,7 @@ keyserver_spawn(int action,STRLIST list,KEYDB_SEARCH_DESC *desc,
int ret=0,i,gotversion=0,outofband=0;
STRLIST temp;
unsigned int maxlen,buflen;
char *command,*searchstr=NULL;
char *command,*end,*searchstr=NULL;
byte *line=NULL;
struct parse_options *kopts;
struct exec_info *spawn;
@ -923,7 +915,7 @@ keyserver_spawn(int action,STRLIST list,KEYDB_SEARCH_DESC *desc,
/* If exec-path was set, and DISABLE_KEYSERVER_PATH is
undefined, then don't specify a full path to gpgkeys_foo, so
that the PATH can work. */
command=xmalloc(strlen(GPGKEYS_PREFIX)+strlen(scheme)+1);
command=xmalloc(GPGKEYS_PREFIX_LEN+strlen(scheme)+1);
command[0]='\0';
}
else
@ -931,14 +923,21 @@ keyserver_spawn(int action,STRLIST list,KEYDB_SEARCH_DESC *desc,
{
/* Specify a full path to gpgkeys_foo. */
command=xmalloc(strlen(libexecdir)+strlen(DIRSEP_S)+
strlen(GPGKEYS_PREFIX)+strlen(scheme)+1);
GPGKEYS_PREFIX_LEN+strlen(scheme)+1);
strcpy(command,libexecdir);
strcat(command,DIRSEP_S);
}
end=command+strlen(command);
strcat(command,GPGKEYS_PREFIX);
strcat(command,scheme);
#ifdef GPGKEYS_CURL
if(!curl_cant_handle(scheme) && path_access(command,X_OK)!=0)
strcpy(end,GPGKEYS_CURL);
#endif
if(opt.keyserver_options.options&KEYSERVER_USE_TEMP_FILES)
{
if(opt.keyserver_options.options&KEYSERVER_KEEP_TEMP_FILES)