#include "keystructs.h"
#include "mem.h"
#include "merge.h"
+#include "openpgp.h"
#include "parsekey.h"
#include "sendsync.h"
publickey != NULL) {
curuid = publickey->uids;
while (curuid != NULL && buf[0] == 0) {
- if (curuid->packet->tag == 13) {
+ if (curuid->packet->tag == OPENPGP_PACKET_UID) {
snprintf(buf, 1023, "%.*s",
(int) curuid->packet->length,
curuid->packet->data);
struct stats_key *key = NULL;
struct stats_key *signedkey = NULL;
struct ll *cursig = NULL;
+ struct ll *sigs = NULL;
bool revoked = false;
if (keyid == 0) {
return NULL;
}
- key = createandaddtohash(keyid);
+ key = findinhash(keyid);
- if (key->gotsigs == false) {
- key->sigs = config.dbbackend->getkeysigs(key->keyid, &revoked);
+ if (key == NULL || key->gotsigs == false) {
+ sigs = config.dbbackend->getkeysigs(keyid, &revoked);
+ if (sigs == NULL) {
+ return NULL;
+ }
+ if (key == NULL) {
+ key = createandaddtohash(keyid);
+ }
+ key->sigs = sigs;
key->revoked = revoked;
for (cursig = key->sigs; cursig != NULL;
cursig = cursig->next) {
for (curkey = *keys; curkey != NULL; curkey = curkey->next) {
intrans = config.dbbackend->starttrans();
logthing(LOGTHING_INFO,
- "Fetching key 0x%llX, result: %d",
+ "Fetching key 0x%" PRIX64 ", result: %d",
get_keyid(curkey),
config.dbbackend->fetch_key(get_keyid(curkey), &oldkey,
intrans));
prev = curkey;
logthing(LOGTHING_INFO,
"Merged key; storing updated key.");
- store_key(oldkey, intrans, true);
+ config.dbbackend->store_key(oldkey, intrans,
+ true);
}
free_publickey(oldkey);
oldkey = NULL;