}
get_skshash(publickey, &hash);
- hashid = (hash.hash[0] << 24) + (hash.hash[1] << 16) +
- (hash.hash[2] << 8) + hash.hash[3];
+ hashid = hash.hash[0];
+ hashid <<= 8;
+ hashid |= hash.hash[1];
+ hashid <<= 8;
+ hashid |= hash.hash[2];
+ hashid <<= 8;
+ hashid |= hash.hash[3];
prove_path_to(hashid, "skshash", dbctx->config->location);
skshashpath(wbuffer, sizeof(wbuffer), &hash,
dbctx->config->location);
/**
* delete_key - Given a keyid delete the key from storage.
- * @keyid: The keyid to delete.
+ * @fp: The fingerprint of the key to delete.
* @intrans: If we're already in a transaction.
*/
-static int fs_delete_key(struct onak_dbctx *dbctx, uint64_t keyid, bool intrans)
+static int fs_delete_key(struct onak_dbctx *dbctx,
+ struct openpgp_fingerprint *fp, bool intrans)
{
static char buffer[PATH_MAX];
int ret;
struct openpgp_fingerprint *subkeyids = NULL;
uint64_t subkeyid;
int i = 0;
+ uint64_t keyid;
- if ((keyid >> 32) == 0)
- keyid = fs_getfullkeyid(dbctx, keyid);
+ keyid = fingerprint2keyid(fp);
+ if (keyid == 0)
+ return 1;
if (!intrans)
fs_starttrans(dbctx);
wl = wl->next;
}
+ llfree(wordlist, free);
+ wordlist = NULL;
subkeyids = keysubkeys(pk);
i = 0;
keypath(buffer, sizeof(buffer), keyid, dbctx->config->location);
unlink(buffer);
+ free_publickey(pk);
+
if (!intrans)
fs_endtrans(dbctx);
return 1;
/* Mmmm nothing to do here? */
close(privctx->lockfile_fd);
+
+ free(privctx);
+ dbctx->priv = NULL;
+ free(dbctx);
}
/**
dbctx->getkeysigs = generic_getkeysigs;
dbctx->cached_getkeysigs = generic_cached_getkeysigs;
dbctx->keyid2uid = generic_keyid2uid;
- dbctx->getfullkeyid = fs_getfullkeyid;
dbctx->iterate_keys = fs_iterate_keys;
return dbctx;