X-Git-Url: https://the.earth.li/gitweb/?a=blobdiff_plain;f=onak.c;h=384b6749f61c372c0d0077f6d8fa5602fff2f247;hb=f063495a9a479e094216875001e3e006344eebcd;hp=63f19d769679ccd9287c59e9e048aac7fc471230;hpb=a799cc2909f47d918d1ec7171a9edba28a9f5136;p=onak.git diff --git a/onak.c b/onak.c index 63f19d7..384b674 100644 --- a/onak.c +++ b/onak.c @@ -330,8 +330,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]); @@ -376,9 +387,16 @@ 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, + true)) { + get_fingerprint(keys->publickey, + &fingerprint); + dbctx->delete_key(dbctx, &fingerprint, + true); + } + } 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." @@ -437,7 +455,8 @@ 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); + get_fingerprint(keys->publickey, &fingerprint); + dbctx->delete_key(dbctx, &fingerprint, true); cleankeys(&keys, config.clean_policies); dbctx->store_key(dbctx, keys, true, false); } else {