Document our test keys

[onak.git] / lookup.c

diff --git a/lookup.c b/lookup.c
index 5d638eab6ef224100a691bff9f8c170ee9498be5..e5cd1ae8e79f452cbd91169ba46db992cede62fd 100644 (file)
--- a/lookup.c
+++ b/lookup.c
@@ -4,8 +4,6 @@
  * Jonathan McDowell <noodles@earth.li>
  *
  * Copyright 2002 Project Purple
- *
- * $Id: lookup.c,v 1.15 2004/05/27 01:25:37 noodles Exp $
  */
 
 #include <inttypes.h>
@@ -17,6 +15,9 @@
 
 #include "armor.h"
 #include "charfuncs.h"
+#include "cleankey.h"
+#include "cleanup.h"
+#include "config.h"
 #include "getcgi.h"
 #include "keydb.h"
 #include "keyindex.h"
@@ -103,7 +104,7 @@ int main(int argc, char *argv[])
                        search = params[i+1];
                        params[i+1] = NULL;
                        if (search != NULL) {
-                               keyid = strtoul(search, &end, 16);
+                               keyid = strtoull(search, &end, 16);
                                if (*search != 0 &&
                                                end != NULL &&
                                                *end == 0) {
@@ -157,13 +158,15 @@ int main(int argc, char *argv[])
        } else {
                readconfig(NULL);
                initlogthing("lookup", config.logfile);
+               catchsignals();
                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 +175,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 +190,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);
@@ -206,7 +212,8 @@ int main(int argc, char *argv[])
        }
        if (!mrhkp) {
                puts("<hr>");
-               puts("Produced by onak " VERSION " by Jonathan McDowell");
+               puts("Produced by onak " PACKAGE_VERSION 
+                               " by Jonathan McDowell");
                end_html();
        }