From 5432755319f34010f587dae19ae325020bf9454c Mon Sep 17 00:00:00 2001 From: David Shaw Date: Mon, 19 Dec 2005 19:39:32 +0000 Subject: * ksutil.h, ksutil.c (curl_armor_writer, curl_writer, curl_writer_finalize): New functionality to handle binary format keys by armoring them for input to GPG. * gpgkeys_curl.c (get_key), gpgkeys_hkp.c (get_key): Call it here. --- keyserver/gpgkeys_curl.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) (limited to 'keyserver/gpgkeys_curl.c') diff --git a/keyserver/gpgkeys_curl.c b/keyserver/gpgkeys_curl.c index 10e44a156..bd26d7849 100644 --- a/keyserver/gpgkeys_curl.c +++ b/keyserver/gpgkeys_curl.c @@ -74,13 +74,18 @@ get_key(char *getkey) res,errorbuffer); fprintf(output,"\nKEY 0x%s FAILED %d\n",getkey,curl_err_to_gpg_err(res)); } - else if(!ctx.done) + else { - fprintf(console,"gpgkeys: no key data found for %s\n",request); - fprintf(output,"\nKEY 0x%s FAILED %d\n",getkey,KEYSERVER_KEY_NOT_FOUND); + curl_writer_finalize(&ctx); + if(!ctx.flags.done) + { + fprintf(console,"gpgkeys: no key data found for %s\n",request); + fprintf(output,"\nKEY 0x%s FAILED %d\n", + getkey,KEYSERVER_KEY_NOT_FOUND); + } + else + fprintf(output,"\nKEY 0x%s END\n",getkey); } - else - fprintf(output,"\nKEY 0x%s END\n",getkey); return curl_err_to_gpg_err(res); } -- cgit v1.2.3