security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-02-01 16:33:02 +01:00
Code Activity

Bug fix - properly handle user IDs with colons (":") in them while HKP

Browse Source 
searching.
This commit is contained in:
David Shaw 2002-02-12 04:38:58 +00:00
parent 35aec9eee2
commit dca36f6252
2 changed files with 36 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
g10/ChangeLog
View File

@ -1,3 +1,8 @@
2002-02-11 David Shaw <dshaw@jabberwocky.com>
* hkp.c (parse_hkp_index): Bug fix - properly handle user IDs with
colons (":") in them while HKP searching.
2002-02-09 David Shaw <dshaw@jabberwocky.com> 2002-02-09 David Shaw <dshaw@jabberwocky.com>
* misc.c (pct_expando): More comments. * misc.c (pct_expando): More comments.

36
g10/hkp.c
View File

@ -1,4 +1,4 @@
/* hkp.c - Horrowitz Keyserver Protocol /* hkp.c - Horowitz Keyserver Protocol
* Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc. * Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
* *
* This file is part of GnuPG. * This file is part of GnuPG.
@ -208,6 +208,32 @@ urlencode_filter( void *opaque, int control,
return rc; return rc;
} }
static int
write_quoted(IOBUF a, const char *buf, char delim)
{
char quoted[5];
sprintf(quoted,"\\x%02X",delim);
while(*buf)
{
if(*buf==delim)
{
if(iobuf_writestr(a,quoted))
return -1;
}
else
{
if(iobuf_writebyte(a,*buf))
return -1;
}
buf++;
}
return 0;
}
/* pub 2048/<a href="/pks/lookup?op=get&search=0x3CB3B415">3CB3B415</a> 1998/04/03 David M. Shaw &lt;<a href="/pks/lookup?op=get&search=0x3CB3B415">dshaw@jabberwocky.com</a>&gt; */ /* pub 2048/<a href="/pks/lookup?op=get&search=0x3CB3B415">3CB3B415</a> 1998/04/03 David M. Shaw &lt;<a href="/pks/lookup?op=get&search=0x3CB3B415">dshaw@jabberwocky.com</a>&gt; */
/* Luckily enough, both the HKP server and NAI HKP interface to their /* Luckily enough, both the HKP server and NAI HKP interface to their
@ -238,16 +264,16 @@ parse_hkp_index(IOBUF buffer,char *line)
{ {
char intstr[11]; char intstr[11];
iobuf_writestr(buffer,key); write_quoted(buffer,key,':');
iobuf_writestr(buffer,":"); iobuf_writestr(buffer,":");
iobuf_writestr(buffer,uid); write_quoted(buffer,uid,':');
iobuf_writestr(buffer,":"); iobuf_writestr(buffer,":");
iobuf_writestr(buffer,revoked?"1:":":"); iobuf_writestr(buffer,revoked?"1:":":");
sprintf(intstr,"%u",createtime); sprintf(intstr,"%u",createtime);
iobuf_writestr(buffer,intstr); write_quoted(buffer,intstr,':');
iobuf_writestr(buffer,"::::"); iobuf_writestr(buffer,"::::");
sprintf(intstr,"%u",bits); sprintf(intstr,"%u",bits);
iobuf_writestr(buffer,intstr); write_quoted(buffer,intstr,':');
iobuf_writestr(buffer,"\n"); iobuf_writestr(buffer,"\n");
ret=1; ret=1;