X-Git-Url: http://the.earth.li/gitweb/?a=blobdiff_plain;f=keyid.h;h=5bf4c2da991af984e43106b6dd9073bba8d8c4a5;hb=76f079e5ebdb34acaaa2462a8d915ee06d3c8425;hp=08bf1fea8d694e36231e000f73f0bc581c09b0c2;hpb=d9432fa0982c0f7a736bf00c04969dedca347ea3;p=onak.git

diff --git a/keyid.h b/keyid.h
index 08bf1fe..5bf4c2d 100644
--- a/keyid.h
+++ b/keyid.h
@@ -1,9 +1,19 @@
 /*
  * 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, see <https://www.gnu.org/licenses/>.
  */
 
 #ifndef __KEYID_H__
@@ -12,36 +22,47 @@
 #include <inttypes.h>
 
 #include "keystructs.h"
+#include "onak.h"
+
+/**
+ *	fingerprint2keyid - convert a fingerprint to a keyid
+ *	@fingerprint: The fingerprint structure to convert
+ *	@returns: 64 bit keyid
+ *
+ *	This function returns the key id for a given fingerprint. Currently
+ *	only works for v4 fingerprints.
+ */
+uint64_t fingerprint2keyid(struct openpgp_fingerprint *fingerprint);
 
 /**
  *	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). 
- *	@len: The length of the returned fingerprint.
+ *	@fingerprint: The fingerprint structure to store the result in
  *
  *	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,
-	unsigned char *fingerprint,
-	size_t *len);
+onak_status_t get_fingerprint(struct openpgp_packet *packet,
+	struct openpgp_fingerprint *fingerprint);
 
 /**
  *	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,7 +74,8 @@ 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.