Start pulling non-library material out of core source files

[onak.git] / keyid.h

diff --git a/keyid.h b/keyid.h
index d6e48e6ceb1d54ca6f2a0b511464dc8db54ef0d5..a0ae4ffe916bcd1bf28395f5127dc91eb3ae9897 100644 (file)
--- a/keyid.h
+++ b/keyid.h
@@ -23,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.
@@ -64,7 +67,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.