X-Git-Url: https://the.earth.li/gitweb/?a=blobdiff_plain;ds=inline;f=keydb.c;h=1a882386bf25933c4ea4ae5fa47853301ce5bd6b;hb=372df79a3c51d8de54440aba9b05f0af28b005a7;hp=354255fecea07fce1b9ca6a2e64aacbdecf9ab7a;hpb=5cb3cfdb9d8caa6d7a4a1979c50c46896957b934;p=onak.git
diff --git a/keydb.c b/keydb.c
index 354255f..1a88238 100644
--- a/keydb.c
+++ b/keydb.c
@@ -13,8 +13,7 @@
* more details.
*
* You should have received a copy of the GNU General Public License along with
- * this program; if not, write to the Free Software Foundation, Inc., 51
- * Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * this program. If not, see .
*/
/**
@@ -25,6 +24,7 @@
* slower than custom functions however.
*/
+#include
#include
#include "decodekey.h"
@@ -32,11 +32,12 @@
#include "keydb.h"
#include "keyid.h"
#include "keystructs.h"
+#include "ll.h"
#include "mem.h"
#include "merge.h"
#include "openpgp.h"
-#include "parsekey.h"
#include "sendsync.h"
+#include "stats.h"
#ifdef NEED_KEYID2UID
/**
@@ -87,13 +88,19 @@ struct ll *generic_getkeysigs(struct onak_dbctx *dbctx,
{
struct ll *sigs = NULL;
struct openpgp_signedpacket_list *uids = NULL;
+ struct openpgp_packet_list *cursig;
struct openpgp_publickey *publickey = NULL;
dbctx->fetch_key_id(dbctx, keyid, &publickey, false);
if (publickey != NULL) {
for (uids = publickey->uids; uids != NULL; uids = uids->next) {
- sigs = keysigs(sigs, uids->sigs);
+ for (cursig = uids->sigs; cursig != NULL;
+ cursig = cursig->next) {
+ sigs = lladd(sigs,
+ createandaddtohash(sig_keyid(
+ cursig->packet)));
+ }
}
if (revoked != NULL) {
*revoked = publickey->revoked;
@@ -148,33 +155,6 @@ struct ll *generic_cached_getkeysigs(struct onak_dbctx *dbctx, uint64_t keyid)
return key->sigs;
}
-#ifdef NEED_GETFULLKEYID
-/**
- * getfullkeyid - Maps a 32bit key id to a 64bit one.
- * @keyid: The 32bit keyid.
- *
- * This function maps a 32bit key id to the full 64bit one. It returns the
- * full keyid. If the key isn't found a keyid of 0 is returned.
- */
-uint64_t generic_getfullkeyid(struct onak_dbctx *dbctx, uint64_t keyid)
-{
- struct openpgp_publickey *publickey = NULL;
-
- if (keyid < 0x100000000LL) {
- dbctx->fetch_key_id(dbctx, keyid, &publickey, false);
- if (publickey != NULL) {
- get_keyid(publickey, &keyid);
- free_publickey(publickey);
- publickey = NULL;
- } else {
- keyid = 0;
- }
- }
-
- return keyid;
-}
-#endif
-
#ifdef NEED_UPDATEKEYS
/**
* update_keys - Takes a list of public keys and updates them in the DB.
@@ -193,17 +173,16 @@ int generic_update_keys(struct onak_dbctx *dbctx,
struct openpgp_publickey *curkey = NULL;
struct openpgp_publickey *oldkey = NULL;
struct openpgp_publickey *prev = NULL;
+ struct openpgp_fingerprint fp;
int newkeys = 0;
bool intrans;
- uint64_t keyid;
for (curkey = *keys; curkey != NULL; curkey = curkey->next) {
intrans = dbctx->starttrans(dbctx);
- get_keyid(curkey, &keyid);
+ get_fingerprint(curkey->publickey, &fp);
logthing(LOGTHING_INFO,
- "Fetching key 0x%" PRIX64 ", result: %d",
- keyid,
- dbctx->fetch_key_id(dbctx, keyid, &oldkey,
+ "Fetching key, result: %d",
+ dbctx->fetch_key_fp(dbctx, &fp, &oldkey,
intrans));
/*
@@ -266,13 +245,23 @@ static int generic_fetch_key_fp(struct onak_dbctx *dbctx,
/*
* We assume if the backend is using this function it's not storing
* anything bigger than the 64 bit key ID and just truncate the
- * fingerprint to get that value. This doesn't work for v3 keys,
+ * fingerprint to get that value. v4 keys want the lowest 64 bits, v5
+ * keys need the top 64 bits. This doesn't work for v3 keys,
* but there's no way to map from v3 fingerprint to v3 key ID so
* if the backend can't do it we're going to fail anyway.
*/
keyid = 0;
- for (i = (fingerprint->length - 8); i < fingerprint->length; i++) {
- keyid = (keyid << 8) + fingerprint->fp[i];
+ if (fingerprint->length == 20) {
+ /* v4 */
+ for (i = (fingerprint->length - 8); i < fingerprint->length;
+ i++) {
+ keyid = (keyid << 8) + fingerprint->fp[i];
+ }
+ } else {
+ /* v5 */
+ for (i = 0; i < 8; i++) {
+ keyid = (keyid << 8) + fingerprint->fp[i];
+ }
}
return dbctx->fetch_key_id(dbctx, keyid, publickey, intrans);