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]);
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);
+ }
+ } 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."
} 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 {