X-Git-Url: https://the.earth.li/gitweb/?a=blobdiff_plain;f=keydb.c;h=f92c252667a95eeb23bed61d76f763d69031e6a7;hb=adc800dbc424a1e246dd4a82a0c2e88eeda25531;hp=c257eb589db31b1c51962049c0e79a3384969dfe;hpb=e0dd4d10f385cd19da389ec66622eea8aa66ae59;p=onak.git
diff --git a/keydb.c b/keydb.c
index c257eb5..f92c252 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,25 +32,26 @@
#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
/**
* keyid2uid - Takes a keyid and returns the primary UID for it.
* @keyid: The keyid to lookup.
*/
-char *generic_keyid2uid(uint64_t keyid)
+char *generic_keyid2uid(struct onak_dbctx *dbctx, uint64_t keyid)
{
struct openpgp_publickey *publickey = NULL;
struct openpgp_signedpacket_list *curuid = NULL;
char buf[1024];
buf[0]=0;
- if (config.dbbackend->fetch_key(keyid, &publickey, false) &&
+ if (dbctx->fetch_key_id(dbctx, keyid, &publickey, false) &&
publickey != NULL) {
curuid = publickey->uids;
while (curuid != NULL && buf[0] == 0) {
@@ -82,17 +83,24 @@ char *generic_keyid2uid(uint64_t keyid)
* indexing and doing stats bits. If revoked is non-NULL then if the key
* is revoked it's set to true.
*/
-struct ll *generic_getkeysigs(uint64_t keyid, bool *revoked)
+struct ll *generic_getkeysigs(struct onak_dbctx *dbctx,
+ uint64_t keyid, bool *revoked)
{
struct ll *sigs = NULL;
struct openpgp_signedpacket_list *uids = NULL;
+ struct openpgp_packet_list *cursig;
struct openpgp_publickey *publickey = NULL;
- config.dbbackend->fetch_key(keyid, &publickey, false);
+ 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;
@@ -112,7 +120,7 @@ struct ll *generic_getkeysigs(uint64_t keyid, bool *revoked)
* getkeysigs function above except we use the hash module to cache the
* data so if we need it again it's already loaded.
*/
-struct ll *generic_cached_getkeysigs(uint64_t keyid)
+struct ll *generic_cached_getkeysigs(struct onak_dbctx *dbctx, uint64_t keyid)
{
struct stats_key *key = NULL;
struct stats_key *signedkey = NULL;
@@ -127,7 +135,7 @@ struct ll *generic_cached_getkeysigs(uint64_t keyid)
key = findinhash(keyid);
if (key == NULL || key->gotsigs == false) {
- sigs = config.dbbackend->getkeysigs(keyid, &revoked);
+ sigs = dbctx->getkeysigs(dbctx, keyid, &revoked);
if (sigs == NULL) {
return NULL;
}
@@ -155,12 +163,12 @@ struct ll *generic_cached_getkeysigs(uint64_t 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(uint64_t keyid)
+uint64_t generic_getfullkeyid(struct onak_dbctx *dbctx, uint64_t keyid)
{
struct openpgp_publickey *publickey = NULL;
if (keyid < 0x100000000LL) {
- config.dbbackend->fetch_key(keyid, &publickey, false);
+ dbctx->fetch_key_id(dbctx, keyid, &publickey, false);
if (publickey != NULL) {
get_keyid(publickey, &keyid);
free_publickey(publickey);
@@ -186,7 +194,8 @@ uint64_t generic_getfullkeyid(uint64_t keyid)
* we had before to what we have now (ie the set of data that was added to
* the DB). Returns the number of entirely new keys added.
*/
-int generic_update_keys(struct openpgp_publickey **keys, bool sendsync)
+int generic_update_keys(struct onak_dbctx *dbctx,
+ struct openpgp_publickey **keys, bool sendsync)
{
struct openpgp_publickey *curkey = NULL;
struct openpgp_publickey *oldkey = NULL;
@@ -196,12 +205,12 @@ int generic_update_keys(struct openpgp_publickey **keys, bool sendsync)
uint64_t keyid;
for (curkey = *keys; curkey != NULL; curkey = curkey->next) {
- intrans = config.dbbackend->starttrans();
+ intrans = dbctx->starttrans(dbctx);
get_keyid(curkey, &keyid);
logthing(LOGTHING_INFO,
"Fetching key 0x%" PRIX64 ", result: %d",
keyid,
- config.dbbackend->fetch_key(keyid, &oldkey,
+ dbctx->fetch_key_id(dbctx, keyid, &oldkey,
intrans));
/*
@@ -227,7 +236,7 @@ int generic_update_keys(struct openpgp_publickey **keys, bool sendsync)
prev = curkey;
logthing(LOGTHING_INFO,
"Merged key; storing updated key.");
- config.dbbackend->store_key(oldkey, intrans,
+ dbctx->store_key(dbctx, oldkey, intrans,
true);
}
free_publickey(oldkey);
@@ -235,11 +244,10 @@ int generic_update_keys(struct openpgp_publickey **keys, bool sendsync)
} else {
logthing(LOGTHING_INFO,
"Storing completely new key.");
- config.dbbackend->store_key(curkey, intrans, false);
+ dbctx->store_key(dbctx, curkey, intrans, false);
newkeys++;
}
- config.dbbackend->endtrans();
- intrans = false;
+ dbctx->endtrans(dbctx);
}
if (sendsync && keys != NULL) {
@@ -249,3 +257,31 @@ int generic_update_keys(struct openpgp_publickey **keys, bool sendsync)
return newkeys;
}
#endif /* NEED_UPDATEKEYS */
+
+#ifdef NEED_GET_FP
+static int generic_fetch_key_fp(struct onak_dbctx *dbctx,
+ struct openpgp_fingerprint *fingerprint,
+ struct openpgp_publickey **publickey, bool intrans)
+{
+ uint64_t keyid;
+ int i;
+
+ if (fingerprint->length > MAX_FINGERPRINT_LEN) {
+ return 0;
+ }
+
+ /*
+ * 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,
+ * 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];
+ }
+
+ return dbctx->fetch_key_id(dbctx, keyid, publickey, intrans);
+}
+#endif