X-Git-Url: http://the.earth.li/gitweb/?a=blobdiff_plain;f=lookup.c;h=50426004a4a6074dcd2cb27d5efc775795e2bc2f;hb=1534798322db09b0f676ab5096ba5a3351b57c6c;hp=5d638eab6ef224100a691bff9f8c170ee9498be5;hpb=42d43e0ec08e249cecf74ec448cb6405b3c89d84;p=onak.git

diff --git a/lookup.c b/lookup.c
index 5d638ea..5042600 100644
--- a/lookup.c
+++ b/lookup.c
@@ -5,7 +5,7 @@
  *
  * Copyright 2002 Project Purple
  *
- * $Id: lookup.c,v 1.15 2004/05/27 01:25:37 noodles Exp $
+ * $Id: lookup.c,v 1.17 2004/05/31 14:16:49 noodles Exp $
  */
 
 #include <inttypes.h>
@@ -17,6 +17,7 @@
 
 #include "armor.h"
 #include "charfuncs.h"
+#include "cleankey.h"
 #include "getcgi.h"
 #include "keydb.h"
 #include "keyindex.h"
@@ -160,10 +161,11 @@ int main(int argc, char *argv[])
 		initdb(true);
 		switch (op) {
 		case OP_GET:
-			logthing(LOGTHING_NOTICE, "Getting keyid %llX",
+			logthing(LOGTHING_NOTICE, "Getting keyid 0x%llX",
 					keyid);
 			if (fetch_key(keyid, &publickey, false)) {
 				puts("<pre>");
+				cleankeys(publickey);
 				flatten_publickey(publickey,
 							&packets,
 							&list_end);
@@ -172,6 +174,8 @@ int main(int argc, char *argv[])
 						packets);
 				puts("</pre>");
 			} else {
+				logthing(LOGTHING_NOTICE,
+					"Failed to fetch key.");
 				puts("Key not found");
 			}
 			break;
@@ -185,12 +189,13 @@ int main(int argc, char *argv[])
 			break;
 		case OP_PHOTO:
 			if (fetch_key(keyid, &publickey, false)) {
-				struct openpgp_packet *photo = NULL;
-				photo = getphoto(publickey, 0);
-				if (photo != NULL) {
-					fwrite(photo->data+19,
+				unsigned char *photo = NULL;
+				size_t         length = 0;
+
+				if (getphoto(publickey, 0, &photo, &length)) {
+					fwrite(photo,
 							1,
-							(photo->length - 19),
+							length,
 							stdout);
 				}
 				free_publickey(publickey);