Use C99 uint32_t rather than u_int32_t

[onak.git] / onak.c

diff --git a/onak.c b/onak.c
index e6b92871ae57a1a4898712a80c06ef07bc869a00..b295fea2126ca772fc96869d59bd180cdd7b8f31 100644 (file)
--- a/onak.c
+++ b/onak.c
@@ -3,9 +3,20 @@
  *
  * This is the main swiss army knife binary.
  *
- * Jonathan McDowell <noodles@earth.li>
- * 
- * Copyright 2002 Project Purple
+ * Copyright 2002 Jonathan McDowell <noodles@earth.li>
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the Free
+ * Software Foundation; version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program; if not, write to the Free Software Foundation, Inc., 51
+ * Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
 #include <fcntl.h>
@@ -21,7 +32,6 @@
 #include "charfuncs.h"
 #include "cleankey.h"
 #include "cleanup.h"
-#include "config.h"
 #include "keydb.h"
 #include "keyid.h"
 #include "keyindex.h"
@@ -32,9 +42,10 @@
 #include "onak-conf.h"
 #include "parsekey.h"
 #include "photoid.h"
+#include "version.h"
 
 void find_keys(char *search, uint64_t keyid, bool ishex,
-               bool fingerprint, bool exact, bool verbose)
+               bool fingerprint, bool skshash, bool exact, bool verbose)
 {
        struct openpgp_publickey *publickey = NULL;
        int count = 0;
@@ -45,7 +56,7 @@ void find_keys(char *search, uint64_t keyid, bool ishex,
                count = config.dbbackend->fetch_key_text(search, &publickey);
        }
        if (publickey != NULL) {
-               key_index(publickey, verbose, fingerprint, false);
+               key_index(publickey, verbose, fingerprint, skshash, false);
                free_publickey(publickey);
        } else if (count == 0) {
                puts("Key not found.");
@@ -93,7 +104,7 @@ void dump_func(void *ctx, struct openpgp_publickey *key)
 }
 
 void usage(void) {
-       puts("onak " PACKAGE_VERSION " - an OpenPGP keyserver.\n");
+       puts("onak " ONAK_VERSION " - an OpenPGP keyserver.\n");
        puts("Usage:\n");
        puts("\tonak [options] <command> <parameters>\n");
        puts("\tCommands:\n");
@@ -128,10 +139,12 @@ int main(int argc, char *argv[])
        bool                             update = false;
        bool                             binary = false;
        bool                             fingerprint = false;
+       bool                             skshash = false;
        int                              optchar;
        struct dump_ctx                  dumpstate;
+       struct skshash                   hash;
 
-       while ((optchar = getopt(argc, argv, "bc:fuv")) != -1 ) {
+       while ((optchar = getopt(argc, argv, "bc:fsuv")) != -1 ) {
                switch (optchar) {
                case 'b': 
                        binary = true;
@@ -142,6 +155,9 @@ int main(int argc, char *argv[])
                case 'f': 
                        fingerprint = true;
                        break;
+               case 's': 
+                       skshash = true;
+                       break;
                case 'u': 
                        update = true;
                        break;
@@ -282,10 +298,10 @@ int main(int argc, char *argv[])
                }
                config.dbbackend->initdb(false);
                if (!strcmp("index", argv[optind])) {
-                       find_keys(search, keyid, ishex, fingerprint,
+                       find_keys(search, keyid, ishex, fingerprint, skshash,
                                        false, false);
                } else if (!strcmp("vindex", argv[optind])) {
-                       find_keys(search, keyid, ishex, fingerprint,
+                       find_keys(search, keyid, ishex, fingerprint, skshash,
                                        false, true);
                } else if (!strcmp("getphoto", argv[optind])) {
                        if (!ishex) {
@@ -336,6 +352,30 @@ int main(int argc, char *argv[])
                        } else {
                                puts("Key not found");
                        }
+               } else if (!strcmp("hget", argv[optind])) {
+                       if (!parse_skshash(search, &hash)) {
+                               puts("Couldn't parse sks hash.");
+                       } else if (config.dbbackend->fetch_key_skshash(&hash,
+                                       &keys)) {
+                               logthing(LOGTHING_INFO, "Got key.");
+                               flatten_publickey(keys,
+                                               &packets,
+                                               &list_end);
+                               free_publickey(keys);
+                               if (binary) {
+                                       write_openpgp_stream(stdout_putchar,
+                                               NULL,
+                                               packets);
+                               } else {
+                                       armor_openpgp_stream(stdout_putchar,
+                                               NULL,
+                                               packets);
+                               }
+                               free_packet_list(packets);
+                               packets = NULL;
+                       } else {
+                               puts("Key not found");
+                       }
                }
                config.dbbackend->cleanupdb();
        } else {