diff options
| -rw-r--r-- | keyserver/ChangeLog | 11 | ||||
| -rw-r--r-- | keyserver/gpgkeys_hkp.c | 10 |
2 files changed, 13 insertions, 8 deletions
diff --git a/keyserver/ChangeLog b/keyserver/ChangeLog index 3be025e37..1636a8c93 100644 --- a/keyserver/ChangeLog +++ b/keyserver/ChangeLog @@ -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 <[email protected]> * 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 gpg) and "key not found" (to user) on failure. - + 2002-09-13 David Shaw <[email protected]> * 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 isn't unsupported, it's actually non-meaningful in the context of HKP (yet). - + * gpgkeys_hkp.c (parse_hkp_index, dehtmlize): Move HTML functionality into new "dehtmlize" function. Remove HTML before trying to parse each line from the keyserver. If the keyserver @@ -560,7 +565,7 @@ * Initial version of gpgkeys_ldap (LDAP keyserver helper) and gpgkeys_mailto (email keyserver helper) - + Copyright 1998, 1999, 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc. diff --git a/keyserver/gpgkeys_hkp.c b/keyserver/gpgkeys_hkp.c index 8c0a0f079..63e851780 100644 --- a/keyserver/gpgkeys_hkp.c +++ b/keyserver/gpgkeys_hkp.c @@ -243,7 +243,7 @@ get_key(char *getkey) else { /* short key id */ - + 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 parse them both. */ -int +int parse_hkp_index(IOBUF buffer,char *line) { int ret=0; @@ -549,7 +549,7 @@ parse_hkp_index(IOBUF buffer,char *line) iobuf_writestr(buffer,"\nuid:"); write_quoted(buffer,uid,':'); } - + iobuf_writestr(buffer,"\n"); ret=1; @@ -629,7 +629,7 @@ search_key(char *searchkey) int max=0,len=0,ret=KEYSERVER_INTERNAL_ERROR,rc; struct http_context hd; char *search=NULL,*request=NULL; - unsigned char *skey=searchkey; + char *skey=searchkey; fprintf(output,"SEARCH %s BEGIN\n",searchkey); @@ -666,7 +666,7 @@ search_key(char *searchkey) { fprintf(console,"gpgkeys: corrupt input?\n"); return -1; - } + } search[len]='\0'; |