security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-02-22 19:58:29 +01:00
Code Activity

fix type incompatibility

Browse Source
This commit is contained in:
Stefan Bellon 2004-08-27 18:21:32 +00:00
parent ea279f1bae
commit 9355045841
2 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
keyserver/ChangeLog
View File

@ -1,3 +1,8 @@
2004-08-27 Stefan Bellon <sbellon@roma>
* gpgkeys_hkp.c (search_key): Change type of variable skey from
unsigned char* to char* to fix type incompatibility.
2004-08-23 David Shaw <dshaw@jabberwocky.com> 2004-08-23 David Shaw <dshaw@jabberwocky.com>
* gpgkeys_ldap.c (get_key, search_key), gpgkeys_hkp.c (get_key, * gpgkeys_ldap.c (get_key, search_key), gpgkeys_hkp.c (get_key,
@ -339,7 +344,7 @@
* gpgkeys_hkp.c (get_key): Properly respond with KEY FAILED (to * gpgkeys_hkp.c (get_key): Properly respond with KEY FAILED (to
gpg) and "key not found" (to user) on failure. gpg) and "key not found" (to user) on failure.
2002-09-13 David Shaw <dshaw@jabberwocky.com> 2002-09-13 David Shaw <dshaw@jabberwocky.com>
* gpgkeys_hkp.c: (search_key, handle_old_hkp_index): Try and * gpgkeys_hkp.c: (search_key, handle_old_hkp_index): Try and
@ -401,7 +406,7 @@
* gpgkeys_hkp.c (main): Don't warn about include-subkeys - it * gpgkeys_hkp.c (main): Don't warn about include-subkeys - it
isn't unsupported, it's actually non-meaningful in the context of isn't unsupported, it's actually non-meaningful in the context of
HKP (yet). HKP (yet).
* gpgkeys_hkp.c (parse_hkp_index, dehtmlize): Move HTML * gpgkeys_hkp.c (parse_hkp_index, dehtmlize): Move HTML
functionality into new "dehtmlize" function. Remove HTML before functionality into new "dehtmlize" function. Remove HTML before
trying to parse each line from the keyserver. If the keyserver trying to parse each line from the keyserver. If the keyserver
@ -560,7 +565,7 @@
* Initial version of gpgkeys_ldap (LDAP keyserver helper) and * Initial version of gpgkeys_ldap (LDAP keyserver helper) and
gpgkeys_mailto (email keyserver helper) gpgkeys_mailto (email keyserver helper)
Copyright 1998, 1999, 2000, 2001, 2002, 2003, Copyright 1998, 1999, 2000, 2001, 2002, 2003,
2004 Free Software Foundation, Inc. 2004 Free Software Foundation, Inc.

10
keyserver/gpgkeys_hkp.c
View File

@ -243,7 +243,7 @@ get_key(char *getkey)
else else
{ {
/* short key id */ /* short key id */
sprintf(search,"0x%.8s",getkey); sprintf(search,"0x%.8s",getkey);
} }
@ -428,7 +428,7 @@ write_quoted(IOBUF a, const char *buf, char delim)
LDAP server are close enough in output so the same function can LDAP server are close enough in output so the same function can
parse them both. */ parse them both. */
int int
parse_hkp_index(IOBUF buffer,char *line) parse_hkp_index(IOBUF buffer,char *line)
{ {
int ret=0; int ret=0;
@ -549,7 +549,7 @@ parse_hkp_index(IOBUF buffer,char *line)
iobuf_writestr(buffer,"\nuid:"); iobuf_writestr(buffer,"\nuid:");
write_quoted(buffer,uid,':'); write_quoted(buffer,uid,':');
} }
iobuf_writestr(buffer,"\n"); iobuf_writestr(buffer,"\n");
ret=1; ret=1;
@ -629,7 +629,7 @@ search_key(char *searchkey)
int max=0,len=0,ret=KEYSERVER_INTERNAL_ERROR,rc; int max=0,len=0,ret=KEYSERVER_INTERNAL_ERROR,rc;
struct http_context hd; struct http_context hd;
char *search=NULL,*request=NULL; char *search=NULL,*request=NULL;
unsigned char *skey=searchkey; char *skey=searchkey;
fprintf(output,"SEARCH %s BEGIN\n",searchkey); fprintf(output,"SEARCH %s BEGIN\n",searchkey);
@ -666,7 +666,7 @@ search_key(char *searchkey)
{ {
fprintf(console,"gpgkeys: corrupt input?\n"); fprintf(console,"gpgkeys: corrupt input?\n");
return -1; return -1;
} }
search[len]='\0'; search[len]='\0';