X-Git-Url: https://git.sommitrealweird.co.uk/onak.git/blobdiff_plain/0fac914c0876bf3cf78c12ea0b9b44880fbdffa4..HEAD:/keydb_keyd.c

diff --git a/keydb_keyd.c b/keydb_keyd.c
index 2a9faaf..26f2f27 100644
--- a/keydb_keyd.c
+++ b/keydb_keyd.c
@@ -1,9 +1,20 @@
 /*
  * keydb_keyd.c - Routines to talk to keyd backend.
  *
- * Jonathan McDowell <noodles@earth.li>
+ * Copyright 2002-2004,2011 Jonathan McDowell <noodles@earth.li>
  *
- * Copyright 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 <errno.h>
@@ -263,7 +274,7 @@ static int keyd_store_key(struct openpgp_publickey *publickey, bool intrans,
 	uint32_t                    cmd = KEYD_CMD_STORE;
 	uint64_t                    keyid;
 
-	keyid = get_keyid(publickey);
+	get_keyid(publickey, &keyid);
 	
 	if (update) {
 		keyd_delete_key(keyid, false);
@@ -352,6 +363,49 @@ static int keyd_fetch_key_text(const char *search,
 	return 0;
 }
 
+static int keyd_fetch_key_skshash(const struct skshash *hash,
+		struct openpgp_publickey **publickey)
+{
+	struct buffer_ctx           keybuf;
+	struct openpgp_packet_list *packets = NULL;
+	uint32_t                    cmd = KEYD_CMD_GETSKSHASH;
+	ssize_t                     bytes = 0;
+	ssize_t                     count = 0;
+
+	write(keyd_fd, &cmd, sizeof(cmd));
+	read(keyd_fd, &cmd, sizeof(cmd));
+	if (cmd == KEYD_REPLY_OK) {
+		write(keyd_fd, hash->hash, sizeof(hash->hash));
+		keybuf.offset = 0;
+		read(keyd_fd, &keybuf.size, sizeof(keybuf.size));
+		if (keybuf.size > 0) {
+			keybuf.buffer = malloc(keybuf.size);
+			bytes = count = 0;
+			logthing(LOGTHING_TRACE,
+					"Getting %d bytes of key data.",
+					keybuf.size);
+			while (bytes >= 0 && count < keybuf.size) {
+				bytes = read(keyd_fd, &keybuf.buffer[count],
+						keybuf.size - count);
+				logthing(LOGTHING_TRACE,
+						"Read %d bytes.", bytes);
+				count += bytes;
+			}
+			read_openpgp_stream(buffer_fetchchar, &keybuf,
+					&packets, 0);
+			parse_keys(packets, publickey);
+			free_packet_list(packets);
+			packets = NULL;
+			free(keybuf.buffer);
+			keybuf.buffer = NULL;
+			keybuf.size = 0;
+		}
+	}
+	
+	return (count > 0) ? 1 : 0;
+}
+
+
 /**
  *	getfullkeyid - Maps a 32bit key id to a 64bit one.
  *	@keyid: The 32bit keyid.
@@ -454,6 +508,7 @@ struct dbfuncs keydb_keyd_funcs = {
 	.endtrans		= keyd_endtrans,
 	.fetch_key		= keyd_fetch_key,
 	.fetch_key_text		= keyd_fetch_key_text,
+	.fetch_key_skshash	= keyd_fetch_key_skshash,
 	.store_key		= keyd_store_key,
 	.update_keys		= generic_update_keys,
 	.delete_key		= keyd_delete_key,