mirror of
git://git.gnupg.org/gnupg.git
synced 2025-07-03 22:56:33 +02:00
* options.h, keyserver.c (parse_keyserver_uri, keyserver_spawn,
keyserver_work), hkp.c (hkp_ask_import, hkp_export, hkp_search): Use a much more strict reading of RFC-2396 for the keyserver URIs. Specifically, don't try and be smart about checking the value of ":port" so long as it is all digits, and properly handle opaque data (those scheme specific parts that do not start with "//").
This commit is contained in:
parent
fd415ba29f
commit
9ffea0d67b
4 changed files with 103 additions and 53 deletions
12
g10/hkp.c
12
g10/hkp.c
|
@ -84,8 +84,8 @@ hkp_ask_import( KEYDB_SEARCH_DESC *desc, void *stats_handle)
|
|||
|
||||
sprintf(request,"x-hkp://%s%s%s/pks/lookup?op=get&search=0x%08lX",
|
||||
opt.keyserver_host,
|
||||
atoi(opt.keyserver_port)>0?":":"",
|
||||
atoi(opt.keyserver_port)>0?opt.keyserver_port:"",
|
||||
opt.keyserver_port?":":"",
|
||||
opt.keyserver_port?opt.keyserver_port:"",
|
||||
(ulong)key[1] );
|
||||
|
||||
if(opt.keyserver_options.verbose>2)
|
||||
|
@ -138,8 +138,8 @@ hkp_export( STRLIST users )
|
|||
|
||||
sprintf( request, "x-hkp://%s%s%s/pks/add",
|
||||
opt.keyserver_host,
|
||||
atoi(opt.keyserver_port)>0?":":"",
|
||||
atoi(opt.keyserver_port)>0?opt.keyserver_port:"");
|
||||
opt.keyserver_port?":":"",
|
||||
opt.keyserver_port?opt.keyserver_port:"");
|
||||
|
||||
if(opt.keyserver_options.verbose>2)
|
||||
log_info("request is \"%s\"\n",request);
|
||||
|
@ -532,8 +532,8 @@ int hkp_search(STRLIST tokens)
|
|||
|
||||
sprintf(request,"x-hkp://%s%s%s/pks/lookup?op=index&search=%s",
|
||||
opt.keyserver_host,
|
||||
atoi(opt.keyserver_port)>0?":":"",
|
||||
atoi(opt.keyserver_port)>0?opt.keyserver_port:"",
|
||||
opt.keyserver_port?":":"",
|
||||
opt.keyserver_port?opt.keyserver_port:"",
|
||||
searchurl);
|
||||
|
||||
if(opt.keyserver_options.verbose>2)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue