#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.
* 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.