X-Git-Url: http://the.earth.li/gitweb/?a=blobdiff_plain;f=keydb_file.c;h=eeae01f3013585504ac13b5c520e2374443c3474;hb=0e735a0b184b202a0533c52171fc55506fa45db2;hp=e99c26898af3385f2237fe7a86e613b850814846;hpb=b8790eaafd4ed0be8ab280581dedd3ff81ba752b;p=onak.git

diff --git a/keydb_file.c b/keydb_file.c
index e99c268..eeae01f 100644
--- a/keydb_file.c
+++ b/keydb_file.c
@@ -1,9 +1,20 @@
 /*
  * keydb.c - Routines to store and fetch keys.
  *
- * Jonathan McDowell <noodles@earth.li>
+ * Copyright 2002-2004 Jonathan McDowell <noodles@earth.li>
  *
- * Copyright 2002-2004 Project Purple
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the Free
+ * Software Foundation; version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * 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.
  */
 
 #include <sys/types.h>
@@ -65,7 +76,7 @@ static void file_endtrans(void)
 }
 
 /**
- *	fetch_key - Given a keyid fetch the key from storage.
+ *	fetch_key_id - Given a keyid fetch the key from storage.
  *	@keyid: The keyid to fetch.
  *	@publickey: A pointer to a structure to return the key in.
  *	@intrans: If we're already in a transaction.
@@ -76,7 +87,8 @@ static void file_endtrans(void)
  *	in and then parse_keys() to parse the packets into a publickey
  *	structure.
  */
-static int file_fetch_key(uint64_t keyid, struct openpgp_publickey **publickey,
+static int file_fetch_key_id(uint64_t keyid,
+		struct openpgp_publickey **publickey,
 		bool intrans)
 {
 	struct openpgp_packet_list *packets = NULL;
@@ -117,9 +129,14 @@ static int file_store_key(struct openpgp_publickey *publickey, bool intrans,
 	struct openpgp_publickey *next = NULL;
 	char keyfile[1024];
 	int fd = -1;
+	uint64_t keyid;
 
+	if (get_keyid(publickey, &keyid) != ONAK_E_OK) {
+		logthing(LOGTHING_ERROR, "Couldn't find key ID for key.");
+		return 0;
+	}
 	snprintf(keyfile, 1023, "%s/0x%" PRIX64, config.db_dir,
-			get_keyid(publickey) & 0xFFFFFFFF);
+			keyid & 0xFFFFFFFF);
 	fd = open(keyfile, O_WRONLY | O_CREAT, 0664); // | O_EXLOCK);
 
 	if (fd > -1) {
@@ -237,6 +254,7 @@ static int file_iterate_keys(void (*iterfunc)(void *ctx,
 #define NEED_GETKEYSIGS 1
 #define NEED_GETFULLKEYID 1
 #define NEED_UPDATEKEYS 1
+#define NEED_GET_FP 1
 #include "keydb.c"
 
 struct dbfuncs keydb_file_funcs = {
@@ -244,7 +262,8 @@ struct dbfuncs keydb_file_funcs = {
 	.cleanupdb		= file_cleanupdb,
 	.starttrans		= file_starttrans,
 	.endtrans		= file_endtrans,
-	.fetch_key		= file_fetch_key,
+	.fetch_key_id		= file_fetch_key_id,
+	.fetch_key_fp		= generic_fetch_key_fp,
 	.fetch_key_text		= file_fetch_key_text,
 	.store_key		= file_store_key,
 	.update_keys		= generic_update_keys,