Cope with colliding 64 bit keyids when verifying signatures

[onak.git] / onak.c

diff --git a/onak.c b/onak.c
index 89c2ec7ba04e5f779ef87c56863b1dd3d919b622..717402ee41137e0e90aa6862d87c8a4396d3f552 100644 (file)
--- a/onak.c
+++ b/onak.c
@@ -27,6 +27,8 @@
 #include <sys/stat.h>
 #include <unistd.h>
 
+#include "build-config.h"
+
 #include "armor.h"
 #include "charfuncs.h"
 #include "cleankey.h"
@@ -41,7 +43,6 @@
 #include "onak-conf.h"
 #include "parsekey.h"
 #include "photoid.h"
-#include "version.h"
 
 void find_keys(struct onak_dbctx *dbctx,
                char *search, uint64_t keyid,
@@ -233,14 +234,18 @@ int main(int argc, char *argv[])
                        logthing(LOGTHING_INFO, "Finished reading %d keys.",
                                        result);
 
-                       result = cleankeys(keys);
+                       dbctx = config.dbinit(config.backend, false);
+                       result = cleankeys(dbctx, &keys,
+                                       config.clean_policies);
                        logthing(LOGTHING_INFO, "%d keys cleaned.",
                                        result);
 
-                       dbctx = config.dbinit(config.backend, false);
                        logthing(LOGTHING_NOTICE, "Got %d new keys.",
                                        dbctx->update_keys(dbctx, &keys,
-                                       false));
+                                               &config.blacklist,
+                                               (config.clean_policies &
+                                                ONAK_CLEAN_UPDATE_ONLY),
+                                               false));
                        if (keys != NULL && update) {
                                flatten_publickey(keys,
                                        &packets,
@@ -271,6 +276,7 @@ int main(int argc, char *argv[])
                        logthing(LOGTHING_NOTICE, "No changes.");
                }
        } else if (!strcmp("clean", argv[optind])) {
+               dbctx = config.dbinit(config.backend, true);
                if (binary) {
                        result = read_openpgp_stream(stdin_getchar, NULL,
                                 &packets, 0);
@@ -288,7 +294,8 @@ int main(int argc, char *argv[])
                                        result);
 
                        if (keys != NULL) {
-                               result = cleankeys(keys);
+                               result = cleankeys(dbctx, &keys,
+                                               config.clean_policies);
                                logthing(LOGTHING_INFO, "%d keys cleaned.",
                                                result);
 
@@ -317,6 +324,7 @@ int main(int argc, char *argv[])
                        free_publickey(keys);
                        keys = NULL;
                }
+               dbctx->cleanupdb(dbctx);
        } else if (!strcmp("dumpconfig", argv[optind])) {
                if ((argc - optind) == 2) {
                        writeconfig(argv[optind + 1]);
@@ -328,8 +336,19 @@ int main(int argc, char *argv[])
                search = argv[optind+1];
                if (search != NULL && strlen(search) == 42 &&
                                search[0] == '0' && search[1] == 'x') {
-                       fingerprint.length = MAX_FINGERPRINT_LEN;
-                       for (i = 0; i < MAX_FINGERPRINT_LEN; i++) {
+                       /* v4 fingerprint */
+                       fingerprint.length = 20;
+                       for (i = 0; i < 20; i++) {
+                               fingerprint.fp[i] =
+                                       (hex2bin(search[2 + i * 2]) << 4) +
+                                               hex2bin(search[3 + i * 2]);
+                       }
+                       isfp = true;
+               } else if (search != NULL && strlen(search) == 66 &&
+                               search[0] == '0' && search[1] == 'x') {
+                       /* v5 fingerprint */
+                       fingerprint.length = 32;
+                       for (i = 0; i < 32; i++) {
                                fingerprint.fp[i] =
                                        (hex2bin(search[2 + i * 2]) << 4) +
                                                hex2bin(search[3 + i * 2]);
@@ -374,9 +393,18 @@ int main(int argc, char *argv[])
                                puts("Key not found");
                        }
                } else if (!strcmp("delete", argv[optind])) {
-                       dbctx->delete_key(dbctx,
-                                       dbctx->getfullkeyid(dbctx, keyid),
-                                       false);
+                       if (!isfp) {
+                               if (dbctx->fetch_key_id(dbctx, keyid, &keys,
+                                                       false)) {
+                                       get_fingerprint(keys->publickey,
+                                                       &fingerprint);
+                                       dbctx->delete_key(dbctx, &fingerprint,
+                                                       false);
+                                       free_publickey(keys);
+                                       keys = NULL;
+                               }
+                       } else
+                               dbctx->delete_key(dbctx, &fingerprint, false);
                } else if (!strcmp("get", argv[optind])) {
                        if (!(ishex || isfp)) {
                                puts("Can't get a key on uid text."
@@ -435,8 +463,9 @@ int main(int argc, char *argv[])
                } else if (!strcmp("reindex", argv[optind])) {
                        dbctx->starttrans(dbctx);
                        if (dbctx->fetch_key_id(dbctx, keyid, &keys, true)) {
-                               dbctx->delete_key(dbctx, keyid, true);
-                               cleankeys(keys);
+                               get_fingerprint(keys->publickey, &fingerprint);
+                               dbctx->delete_key(dbctx, &fingerprint, true);
+                               cleankeys(dbctx, &keys, config.clean_policies);
                                dbctx->store_key(dbctx, keys, true, false);
                        } else {
                                puts("Key not found");