X-Git-Url: http://the.earth.li/gitweb/?a=blobdiff_plain;ds=sidebyside;f=keyid.h;h=5bf4c2da991af984e43106b6dd9073bba8d8c4a5;hb=5d606c2c010784f3d7ceaa4fd9a604b1147fa18d;hp=d6e48e6ceb1d54ca6f2a0b511464dc8db54ef0d5;hpb=5e1b22d763640c4d7a09d07920403d8d491b4410;p=onak.git
diff --git a/keyid.h b/keyid.h
index d6e48e6..5bf4c2d 100644
--- a/keyid.h
+++ b/keyid.h
@@ -13,8 +13,7 @@
* 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.
+ * this program. If not, see .
*/
#ifndef __KEYID_H__
@@ -23,36 +22,47 @@
#include
#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.
@@ -64,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.