Add support for displaying EDDSA keys

[onak.git] / hashquery.c

diff --git a/hashquery.c b/hashquery.c
index a0f8e1ececcda69ae814c3f820ca1da14457a868..965eaf9d19ab233c5b6c7b674d6b7237aff6122e 100644 (file)
--- a/hashquery.c
+++ b/hashquery.c
@@ -2,6 +2,19 @@
  * hashquery.c - CGI to handle SKS style /pks/hashquery requests
  *
  * Copyright 2011 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 <stdio.h>
@@ -34,6 +47,7 @@ int main(int argc, char *argv[])
        uint8_t **hashes;
        struct buffer_ctx cgipostbuf;
        struct openpgp_publickey **keys;
+       struct onak_dbctx *dbctx;
 
        readconfig(NULL);
        initlogthing("hashquery", config.logfile);
@@ -75,15 +89,16 @@ int main(int argc, char *argv[])
                doerror("Couldn't allocate memory for reply.\n");
        }
 
-       if (config.dbbackend->fetch_key_skshash == NULL) {
+       catchsignals();
+       dbctx = config.dbinit(false);
+
+       if (dbctx->fetch_key_skshash == NULL) {
+               dbctx->cleanupdb(dbctx);
                doerror("Can't fetch by skshash with this backend.");
        }
 
-       catchsignals();
-       config.dbbackend->initdb(false);
-
        for (i = 0; i < count; i++) {
-               config.dbbackend->fetch_key_skshash(
+               dbctx->fetch_key_skshash(dbctx,
                                (struct skshash *) hashes[i], &keys[found]);
                if (keys[found] != NULL) {
                        found++;
@@ -94,7 +109,7 @@ int main(int argc, char *argv[])
        free(hashes);
        hashes = NULL;
 
-       config.dbbackend->cleanupdb();
+       dbctx->cleanupdb(dbctx);
 
        puts("Content-Type: pgp/keys\n");
        marshal_array(stdout_putchar, NULL,