X-Git-Url: https://git.sommitrealweird.co.uk/onak.git/blobdiff_plain/3cdd1ba5400b97412d8e69fdcf59284b7cde6e28..HEAD:/keyid.h

diff --git a/keyid.h b/keyid.h
index 202a4a0..a0ae4ff 100644
--- a/keyid.h
+++ b/keyid.h
@@ -1,9 +1,20 @@
 /*
  * keyid.h - Routines to calculate key IDs.
  *
- * Jonathan McDowell <noodles@earth.li>
+ * Copyright 2002,2011 Jonathan McDowell <noodles@earth.li>
  *
- * Copyright 2002 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.
  */
 
 #ifndef __KEYID_H__
@@ -12,36 +23,39 @@
 #include <inttypes.h>
 
 #include "keystructs.h"
+#include "onak.h"
 
 /**
  *	get_keyid - Given a public key returns the keyid.
  *	@publickey: The key to calculate the id for.
+ *	@keeyid: The returned keyid
  *
  *	This function returns the key id for a given public key.
  */
-uint64_t get_keyid(struct openpgp_publickey *publickey);
+onak_status_t get_keyid(struct openpgp_publickey *publickey, uint64_t *keyid);
 
 /**
  *	get_fingerprint - Given a public key returns the fingerprint.
  *	@publickey: The key to calculate the id for.
- *	@fingerprint: The fingerprint (must be at least 20 bytes of space). 
+ *	@fingerprint: The fingerprint (must be at least 20 bytes of space).
  *	@len: The length of the returned fingerprint.
  *
  *	This function returns the fingerprint for a given public key. As Type 3
  *	fingerprints are 16 bytes and Type 4 are 20 the len field indicates
  *	which we've returned.
  */
-unsigned char *get_fingerprint(struct openpgp_packet *packet,
+onak_status_t get_fingerprint(struct openpgp_packet *packet,
 	unsigned char *fingerprint,
 	size_t *len);
 
 /**
  *	get_packetid - Given a PGP packet returns the keyid.
  *	@packet: The packet to calculate the id for.
+ *	@keyid: The returned keyid
  *
  *	This function returns the key id for a given PGP packet.
  */
-uint64_t get_packetid(struct openpgp_packet *packet);
+onak_status_t get_packetid(struct openpgp_packet *packet, uint64_t *keyid);
 
 /**
  *	get_skshash - Given a public key returns the SKS hash for it.
@@ -53,6 +67,19 @@ uint64_t get_packetid(struct openpgp_packet *packet);
  *	make up the key. The caller should allocate the memory for the
  *	hash.
  */
-void get_skshash(struct openpgp_publickey *publickey, struct skshash *hash);
+onak_status_t get_skshash(struct openpgp_publickey *publickey,
+	struct skshash *hash);
+
+/**
+ *	parse_skshash - Parse a string into an SKS hash structure.
+ *	@search: The string representing the SKS hash.
+ *	@hash: A pointer to the structure to store the hash in.
+ *
+ *	Takes a string and tries to parse it as an SKS hash hex
+ *	representation. Puts the hash into the supplied structure
+ *	if successful. Returns 1 if we parsed something ok, 0 if
+ *	we failed.
+ */
+int parse_skshash(char *search, struct skshash *hash);
 
 #endif /* __KEYID_H__ */