Use nettle for hashing when available rather than internal MD5/SHA1 routines

[onak.git] / gpgwww.c

diff --git a/gpgwww.c b/gpgwww.c
index 7d90a00332f585fc4be843af4ea73bfcb83f02ea..84f00e4d70d9674cfc11f0c9babe1a112c714aca 100644 (file)
--- a/gpgwww.c
+++ b/gpgwww.c
@@ -1,9 +1,20 @@
 /*
  * gpgwww.c - www interface to path finder.
 /*
  * gpgwww.c - www interface to path finder.

- * 
- * Jonathan McDowell <noodles@earth.li>

  *
  *

- * Copyright 2001-2002 Project Purple.
+ * Copyright 2001-2004 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 <inttypes.h>
  */
 
 #include <inttypes.h>


@@ -14,7 +25,6 @@
 #include "armor.h"
 #include "charfuncs.h"
 #include "cleanup.h"
 #include "armor.h"
 #include "charfuncs.h"
 #include "cleanup.h"

-#include "config.h"

 #include "getcgi.h"
 #include "hash.h"
 #include "keydb.h"
 #include "getcgi.h"
 #include "hash.h"
 #include "keydb.h"


@@ -23,6 +33,7 @@
 #include "onak-conf.h"
 #include "parsekey.h"
 #include "stats.h"
 #include "onak-conf.h"
 #include "parsekey.h"
 #include "stats.h"

+#include "version.h"

 
 #define OP_UNKNOWN 0
 #define OP_GET     1
 
 #define OP_UNKNOWN 0
 #define OP_GET     1


@@ -58,7 +69,6 @@ int getkeyspath(uint64_t have, uint64_t want, int count)
        struct openpgp_packet_list *list_end = NULL;
        struct stats_key *keyinfoa, *keyinfob, *curkey;
        uint64_t fullhave, fullwant;
        struct openpgp_packet_list *list_end = NULL;
        struct stats_key *keyinfoa, *keyinfob, *curkey;
        uint64_t fullhave, fullwant;

-       int rec;

        int pathlen = 0;
 
        fullhave = config.dbbackend->getfullkeyid(have);
        int pathlen = 0;
 
        fullhave = config.dbbackend->getfullkeyid(have);


@@ -82,7 +92,7 @@ int getkeyspath(uint64_t have, uint64_t want, int count)
                 * Fill the tree info up.
                 */
                initcolour(true);
                 * Fill the tree info up.
                 */
                initcolour(true);

-               rec = findpath(keyinfoa, keyinfob);
+               findpath(keyinfoa, keyinfob);

                keyinfob->parent = 0;
                if (keyinfoa->colour == 0) {
                        pathlen = count;
                keyinfob->parent = 0;
                if (keyinfoa->colour == 0) {
                        pathlen = count;


@@ -190,9 +200,7 @@ int main(int argc, char *argv[])
 
        if (op != OP_GET) {
                puts("<HR>");
 
        if (op != OP_GET) {
                puts("<HR>");

-               puts("Produced by gpgwww " PACKAGE_VERSION ", part of onak. "
-                       "<A HREF=\"mailto:noodles-onak@earth.li\">"
-                       "Jonathan McDowell</A>");
+               puts("Produced by gpgwww " ONAK_VERSION ", part of onak. ");

                end_html();
        }
 
                end_html();
        }