mirror of
git://git.gnupg.org/gnupg.git
synced 2025-07-03 22:56:33 +02:00
* keylist.c (list_keyblock_colon): Show 1F direct key signatures in
--with-colons listing. * keyserver.c (keyserver_spawn): Properly handle line truncation. Don't leak memory (~10-20 bytes) on searches. (keyserver_search_prompt): Cleanup. * hkp.c (hkp_search): Properly handle line truncation.
This commit is contained in:
parent
32a3f9ec4b
commit
d477cf2bfb
4 changed files with 30 additions and 16 deletions
|
@ -475,7 +475,6 @@ parse_hkp_index(IOBUF buffer,char *line)
|
|||
int hkp_search(STRLIST tokens)
|
||||
{
|
||||
int rc=0,len=0,max,first=1;
|
||||
unsigned int maxlen=1024,buflen=0;
|
||||
#ifndef __riscos__
|
||||
unsigned char *searchstr=NULL,*searchurl;
|
||||
unsigned char *request;
|
||||
|
@ -485,7 +484,6 @@ int hkp_search(STRLIST tokens)
|
|||
#endif
|
||||
struct http_context hd;
|
||||
unsigned int hflags=opt.keyserver_options.honor_http_proxy?HTTP_FLAG_TRY_PROXY:0;
|
||||
byte *line=NULL;
|
||||
|
||||
/* Glue the tokens together to make a search string */
|
||||
|
||||
|
@ -569,13 +567,17 @@ int hkp_search(STRLIST tokens)
|
|||
{
|
||||
IOBUF buffer;
|
||||
int count=1;
|
||||
int ret;
|
||||
int ret=0; /* gcc wants me to initialize this */
|
||||
unsigned int buflen;
|
||||
byte *line=NULL;
|
||||
|
||||
buffer=iobuf_temp();
|
||||
|
||||
rc=1;
|
||||
while(rc!=0)
|
||||
{
|
||||
unsigned int maxlen=1024;
|
||||
|
||||
/* This is a judgement call. Is it better to slurp up all
|
||||
the results before prompting the user? On the one hand,
|
||||
it probably makes the keyserver happier to not be blocked
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue