changed get_id/get_encoding API of private/public key to use new encoding framework

src/libstrongswan/credentials/keys/private_key.h

@@ -23,7 +23,6 @@
 
 typedef struct private_key_t private_key_t;
 
-#include <utils/identification.h>
 #include <credentials/keys/public_key.h>
 
 /**
@@ -64,14 +63,6 @@ struct private_key_t {
 	 */
 	size_t (*get_keysize) (private_key_t *this);
 	
-	/**
-	 * Get a unique key identifier, such as a hash over the public key.
-	 * 
-	 * @param type		type of the key ID to get
-	 * @return			unique ID of the key as identification_t, or NULL
-	 */
-	identification_t* (*get_id) (private_key_t *this, id_type_t type);
-	
 	/**
 	 * Get the public part from the private key.
 	 *
@@ -96,13 +87,24 @@ struct private_key_t {
 	bool (*belongs_to) (private_key_t *this, public_key_t *public);
 	
 	/**
-	 * Get an encoded form of the private key.
+	 * Get the fingerprint of the key.
 	 *
-	 * @todo Do we need a encoding type specification?
+	 * @param type		type of fingerprint, one of KEY_ID_*
-	 *
+	 * @param fp		fingerprint, points to internal data
-	 * @return			allocated chunk containing encoded private key
+	 * @return			TRUE if fingerprint type supported
 	 */
-	chunk_t (*get_encoding)(private_key_t *this);	
+	bool (*get_fingerprint)(private_key_t *this, key_encoding_type_t type,
+							chunk_t *fp);
+	
+	/**
+	 * Get the key in an encoded form as a chunk.
+	 *
+	 * @param type		type of the encoding, one of KEY_PRIV_*
+	 * @param encoding	encoding of the key, allocated
+	 * @return			TRUE if encoding supported
+	 */
+	bool (*get_encoding)(private_key_t *this, key_encoding_type_t type,
+						 chunk_t *encoding);
 	
 	/**
 	 * Increase the refcount to this private key.

src/libstrongswan/credentials/keys/public_key.h

@@ -139,21 +139,24 @@ struct public_key_t {
 	size_t (*get_keysize) (public_key_t *this);
 	
 	/**
-	 * Get a unique key identifier, such as a hash over the key.
+	 * Get the fingerprint of the key.
 	 *
-	 * @param type		type of the key ID to get
+	 * @param type		type of fingerprint, one of KEY_ID_*
-	 * @return			unique ID of the key as identification_t, or NULL
+	 * @param fp		fingerprint, points to internal data
+	 * @return			TRUE if fingerprint type supported
 	 */
-	identification_t* (*get_id) (public_key_t *this, id_type_t type);
+	bool (*get_fingerprint)(public_key_t *this, key_encoding_type_t type,
+							chunk_t *fp);
 	
 	/**
-	 * Get an encoded form of the key.
+	 * Get the key in an encoded form as a chunk.
 	 *
-	 * @todo Do we need a encoding type specification?
+	 * @param type		type of the encoding, one of KEY_PRIV_*
-	 *
+	 * @param encoding	encoding of the key, allocated
-	 * @return			allocated chunk containing encoded key
+	 * @return			TRUE if encoding supported
 	 */
-	chunk_t (*get_encoding)(public_key_t *this);	
+	bool (*get_encoding)(public_key_t *this, key_encoding_type_t type,
+						 chunk_t *encoding);
 	
 	/**
 	 * Increase the refcount of the key.