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

Make use of strconcat to make the code more robust against future changes.

Browse Source
This commit is contained in:
Werner Koch 2009-08-26 10:58:13 +00:00
parent bc9dd2e5f6
commit 490f747182
2 changed files with 55 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
keyserver/ChangeLog
View File

@ -1,5 +1,11 @@
2009-08-26 Werner Koch <wk@g10code.com>
* gpgkeys_hkp.c: Include util.h.
(send_key): Use strconcat to build KEY.
(appendable_path): New.
(get_name): Use strconcat to build REQUEST.
(search_key): Ditto.
* ksutil.c: Include util.h.
(parse_ks_options): Use make_filename_try for the ca-cert-file arg.

88
keyserver/gpgkeys_hkp.c
View File

@ -43,6 +43,7 @@
#else
#include "curl-shim.h"
#endif
#include "util.h"
#ifdef USE_DNS_SRV
#include "srv.h"
#endif
@ -94,6 +95,20 @@ append_path(char *dest,const char *src)
return strcat(dest,src);
}
/* Return a pointer into STRING so that appending PATH to STRING will
not yield a duplicated slash. */
static const char *
appendable_path (const char *string, const char *path)
{
size_t n;
if (path[0] == '/' && (n=strlen (string)) && string[n-1] == '/')
return path+1;
else
return path;
}
int
send_key(int *r_eof)
{
@ -174,7 +189,7 @@ send_key(int *r_eof)
free(key);
key=malloc(8+strlen(encoded_key)+1);
key = strconcat ("keytext=", encoded_key, NULL);
if(!key)
{
fprintf(console,"gpgkeys: out of memory\n");
@ -182,9 +197,6 @@ send_key(int *r_eof)
goto fail;
}
strcpy(key,"keytext=");
strcat(key,encoded_key);
strcpy(request,proto);
strcat(request,"://");
strcat(request,opt->host);
@ -216,7 +228,7 @@ send_key(int *r_eof)
ret=KEYSERVER_OK;
fail:
free(key);
xfree (key);
curl_free(encoded_key);
if(ret!=0 && begin)
@ -319,7 +331,17 @@ get_name(const char *getkey)
goto fail;
}
request=malloc(MAX_URL+60+strlen(searchkey_encoded));
request = strconcat
(proto,
"://",
opt->host,
":",
port,
opt->path,
appendable_path (opt->path,"/pks/lookup?op=get&options=mr&search="),
searchkey_encoded,
opt->action == KS_GETNAME? "&exact=on":"",
NULL);
if(!request)
{
fprintf(console,"gpgkeys: out of memory\n");
@ -329,18 +351,6 @@ get_name(const char *getkey)
fprintf(output,"NAME %s BEGIN\n",getkey);
strcpy(request,proto);
strcat(request,"://");
strcat(request,opt->host);
strcat(request,":");
strcat(request,port);
strcat(request,opt->path);
append_path(request,"/pks/lookup?op=get&options=mr&search=");
strcat(request,searchkey_encoded);
if(opt->action==KS_GETNAME)
strcat(request,"&exact=on");
if(opt->verbose>2)
fprintf(console,"gpgkeys: HTTP URL is `%s'\n",request);
@ -372,7 +382,7 @@ get_name(const char *getkey)
fail:
curl_free(searchkey_encoded);
free(request);
xfree (request);
if(ret!=KEYSERVER_OK)
fprintf(output,"\nNAME %s FAILED %d\n",getkey,ret);
@ -388,6 +398,7 @@ search_key(const char *searchkey)
char *searchkey_encoded;
int ret=KEYSERVER_INTERNAL_ERROR;
enum ks_search_type search_type;
const char *hexprefix;
search_type=classify_ks_search(&searchkey);
@ -403,7 +414,23 @@ search_key(const char *searchkey)
goto fail;
}
request=malloc(MAX_URL+60+strlen(searchkey_encoded));
/* HKP keyservers like the 0x to be present when searching by
keyid. */
hexprefix = (search_type==KS_SEARCH_KEYID_SHORT
|| search_type==KS_SEARCH_KEYID_LONG)? "0x":"";
request = strconcat
(proto,
"://",
opt->host,
":",
port,
opt->path,
appendable_path (opt->path, "/pks/lookup?op=index&options=mr&search="),
hexprefix,
searchkey_encoded,
opt->action == KS_GETNAME? "&exact=on":"",
NULL);
if(!request)
{
fprintf(console,"gpgkeys: out of memory\n");
@ -413,24 +440,6 @@ search_key(const char *searchkey)
fprintf(output,"SEARCH %s BEGIN\n",searchkey);
strcpy(request,proto);
strcat(request,"://");
strcat(request,opt->host);
strcat(request,":");
strcat(request,port);
strcat(request,opt->path);
append_path(request,"/pks/lookup?op=index&options=mr&search=");
/* HKP keyservers like the 0x to be present when searching by
keyid */
if(search_type==KS_SEARCH_KEYID_SHORT || search_type==KS_SEARCH_KEYID_LONG)
strcat(request,"0x");
strcat(request,searchkey_encoded);
if(search_type!=KS_SEARCH_SUBSTR)
strcat(request,"&exact=on");
if(opt->verbose>2)
fprintf(console,"gpgkeys: HTTP URL is `%s'\n",request);
@ -451,9 +460,8 @@ search_key(const char *searchkey)
}
fail:
curl_free(searchkey_encoded);
free(request);
xfree (request);
if(ret!=KEYSERVER_OK)
fprintf(output,"\nSEARCH %s FAILED %d\n",searchkey,ret);