Changes the function name to make clear OpenPGP uses keys and

not certificates like X.509.

diff --git a/lib/gnutls_openpgp.c b/lib/gnutls_openpgp.c
index ecebc32d81688b0cc937a2d8b411edb1b3477cbf..d34e226f25d1dc32492ed5c4fa07e6a669fd6032 100644 (file)
--- a/lib/gnutls_openpgp.c
+++ b/lib/gnutls_openpgp.c
@@ -566,7 +566,7 @@ leave:
 }
 
 /**
- * gnutls_openpgp_extract_certificate_dn - Extracts the userID
+ * gnutls_openpgp_extract_key_name - Extracts the userID
  *
  * @cert: the raw data that contains the OpenPGP public key.
  * @dn: the structure to store the userID specific data in.
@@ -574,8 +574,8 @@ leave:
  * Extracts the userID from the raw OpenPGP key.
  **/
 int
-gnutls_openpgp_extract_certificate_dn( const gnutls_datum *cert,
-                                       gnutls_openpgp_name *dn )
+gnutls_openpgp_extract_key_name( const gnutls_datum *cert,
+                                 gnutls_openpgp_name *dn )
 {
   PKT pkt = NULL;
   PKT_userid *uid = NULL;
@@ -620,14 +620,14 @@ leave:
 }
 
 /**
- * gnutls_openpgp_extract_certificate_version- Extracts the version
+ * gnutls_openpgp_extract_key_version - Extracts the version of the key.
  *
  * @cert: the raw data that contains the OpenPGP public key.
  *
  * Extract the version of the OpenPGP key.
  **/
 int
-gnutls_openpgp_extract_certificate_version( const gnutls_datum *cert )
+gnutls_openpgp_extract_key_version( const gnutls_datum *cert )
 {
   PKT pkt = NULL;
   PKT_public_key *pk = NULL;
@@ -647,14 +647,14 @@ gnutls_openpgp_extract_certificate_version( const gnutls_datum *cert )
 }
 
 /**
- * gnutls_openpgp_extract_certificate_activation_time - Extract the timestamp
+ * gnutls_openpgp_extract_key_creation_time - Extract the timestamp
  *
  * @cert: the raw data that contains the OpenPGP public key.
  *
  * Returns the timestamp when the OpenPGP key was created.
  **/
 time_t
-gnutls_openpgp_extract_certificate_activation_time( const gnutls_datum *cert )
+gnutls_openpgp_extract_key_creation_time( const gnutls_datum *cert )
 {
   PKT pkt = NULL;
   PKT_public_key *pk = NULL;
@@ -674,7 +674,7 @@ gnutls_openpgp_extract_certificate_activation_time( const gnutls_datum *cert )
 }
 
 /**
- * gnutls_openpgp_extract_certificate_expiration_time - Extract the expire date
+ * gnutls_openpgp_extract_key_expiration_time - Extract the expire date
  *
  * @cert: the raw data that contains the OpenPGP public key.
  *
@@ -682,7 +682,7 @@ gnutls_openpgp_extract_certificate_activation_time( const gnutls_datum *cert )
  * that the key doesn't expire at all.
  **/
 time_t
-gnutls_openpgp_extract_certificate_expiration_time( const gnutls_datum *cert )
+gnutls_openpgp_extract_key_expiration_time( const gnutls_datum *cert )
 {
   PKT pkt = NULL;
   PKT_public_key *pk = NULL;
@@ -702,7 +702,7 @@ gnutls_openpgp_extract_certificate_expiration_time( const gnutls_datum *cert )
 }
 
 /**
- * gnutls_openpgp_verify_certificate - Verify all signatures on the key
+ * gnutls_openpgp_verify_key - Verify all signatures on the key
  *
  * @cert_list: the structure that holds the certificates.
  * @cert_list_lenght: the items in the cert_list.
@@ -712,8 +712,8 @@ gnutls_openpgp_extract_certificate_expiration_time( const gnutls_datum *cert )
  * A return value of '0' means that all checked signatures are good.
  **/
 int
-gnutls_openpgp_verify_certificate( const gnutls_datum* cert_list,
-                                   int cert_list_length)
+gnutls_openpgp_verify_key( const gnutls_datum* cert_list,
+                           int cert_list_length)
 
 {
   PKT pkt = NULL;
@@ -831,3 +831,4 @@ gnutls_openpgp_add_keyring(const char *fname, int is_secret)
 
 #endif /* HAVE_LIBOPENCDK */
 
+

diff --git a/lib/gnutls_openpgp.h b/lib/gnutls_openpgp.h
index 6f1987a50e99dc162f021550a4569cf9598c0651..877d8802e9bf3546f815742480c11bccff2dc67d 100644 (file)
--- a/lib/gnutls_openpgp.h
+++ b/lib/gnutls_openpgp.h
@@ -5,17 +5,18 @@ int gnutls_certificate_set_openpgp_key_file(
                                             GNUTLS_CERTIFICATE_CREDENTIALS res,
                                             char* CERTFILE,
                                             char* KEYFILE);
-int gnutls_openpgp_extract_certificate_dn( const gnutls_datum *cert,
-                                                  gnutls_openpgp_name *dn);
-int gnutls_openpgp_extract_certificate_version( const gnutls_datum *cert );
-time_t gnutls_openpgp_extract_certificate_activation_time(
-                                                          const gnutls_datum
-                                                          *cert );
-time_t gnutls_openpgp_extract_certificate_expiration_time(
-                                                          const gnutls_datum
-                                                          *cert );
-int gnutls_openpgp_verify_certificate( const gnutls_datum* cert_list,
-                                       int cert_list_length);
+
+int gnutls_openpgp_extract_key_name( const gnutls_datum *cert,
+                                     gnutls_openpgp_name *dn );
+
+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_verify_key( const gnutls_datum* cert_list,
+                               int cert_list_length );
 
 int gnutls_openpgp_fingerprint( const gnutls_datum *cert, opaque *fpr,
                                 size_t *fprlen );
@@ -27,10 +28,13 @@ int gnutls_openpgp_add_keyring( const char *fname, int is_secret );
 /* internal */
 int _gnutls_openpgp_cert2gnutls_cert(gnutls_cert *cert, gnutls_datum raw);
 
-     
-
 #endif /*GNUTLS_OPENPGP_H*/
 
 
 
 
+
+
+
+
+