Exported gnutls_openpgp_extract_key_id(). This is the gnutls_openpgp_keyid() function...

diff --git a/includes/gnutls/extra.h b/includes/gnutls/extra.h
index 4d4d705deadaa583fdc04ec3ac02c1d56949595c..3970a12ddc7a0051f77bb622db99890aec36445d 100644 (file)
--- a/includes/gnutls/extra.h
+++ b/includes/gnutls/extra.h
@@ -70,6 +70,8 @@ int gnutls_openpgp_extract_key_version( const gnutls_datum *cert );
 time_t gnutls_openpgp_extract_key_creation_time( const gnutls_datum *cert );
 time_t gnutls_openpgp_extract_key_expiration_time( const gnutls_datum *cert );
 
+int gnutls_openpgp_extract_key_id( const gnutls_datum *cert, unsigned char keyid[8]);
+
 int gnutls_openpgp_verify_key( const gnutls_datum* keyring, 
        const gnutls_datum* key_list, 
        int key_list_length);

diff --git a/libextra/gnutls_openpgp.c b/libextra/gnutls_openpgp.c
index 9356b63f75384392fcc702d4c155d9b7dc0168d2..0434723aac198d6276fd524f1012c97a2e7877de 100644 (file)
--- a/libextra/gnutls_openpgp.c
+++ b/libextra/gnutls_openpgp.c
@@ -1193,15 +1193,15 @@ gnutls_openpgp_fingerprint(const gnutls_datum *cert, char *fpr, size_t *fprlen)
     return 0;
 }
 
-/*-
- * gnutls_openpgp_keyid - Gets the keyID
+/**
+ * gnutls_openpgp_extract_key_id - Gets the keyID
  * @cert: the raw data that contains the OpenPGP public key.
  * @keyid: the buffer to save the keyid.
  *
  * Returns the 64-bit keyID of the OpenPGP key.
- -*/
+ **/
 int
-gnutls_openpgp_keyid( const gnutls_datum *cert, unsigned char keyid[8] )
+gnutls_openpgp_extract_key_id( const gnutls_datum *cert, unsigned char keyid[8] )
 {
     CDK_KBNODE kb_pk = NULL, pkt;
     cdkPKT_public_key *pk = NULL;

diff --git a/libextra/gnutls_openpgp.h b/libextra/gnutls_openpgp.h
index 7c8d1de56c1fc178b15dc0cf3daa790248458f61..fb0c5ba5eadcf33dc21d173588d31140504ae168 100644 (file)
--- a/libextra/gnutls_openpgp.h
+++ b/libextra/gnutls_openpgp.h
@@ -48,7 +48,7 @@ int gnutls_openpgp_fingerprint(
     char *fpr,
     size_t *fprlen );
 
-int gnutls_openpgp_keyid(
+int gnutls_openpgp_extract_key_id(
     const gnutls_datum *cert,
     unsigned char keyid[8] );