Renamed gnutls_openpgp_key_t to gnutls_openpgp_cert_t

2 files changed, 22 insertions, 21 deletions

diff --git a/includes/gnutls/gnutls.h.in b/includes/gnutls/gnutls.h.in
index aa89d569d1..ff238b36c3 100644
--- a/includes/gnutls/gnutls.h.in
+++ b/includes/gnutls/gnutls.h.in
@@ -960,8 +960,9 @@ extern "C"
     GNUTLS_SAN_OTHERNAME_XMPP = 1000
   } gnutls_x509_subject_alt_name_t;
 
-  struct gnutls_openpgp_key_int;
-  typedef struct gnutls_openpgp_key_int *gnutls_openpgp_key_t;
+  struct gnutls_openpgp_cert_int;
+  typedef struct gnutls_openpgp_cert_int *gnutls_openpgp_cert_t;
+#define gnutls_openpgp_key_t gnutls_openpgp_cert_t
 
   struct gnutls_openpgp_privkey_int;
   typedef struct gnutls_openpgp_privkey_int *gnutls_openpgp_privkey_t;
@@ -972,7 +973,7 @@ extern "C"
     union cert
     {
       gnutls_x509_crt_t *x509;
-      gnutls_openpgp_key_t pgp;
+      gnutls_openpgp_cert_t pgp;
     } cert;
     unsigned int ncerts;	/* one for pgp keys */
 
diff --git a/includes/gnutls/openpgp.h b/includes/gnutls/openpgp.h
index 2393ab1967..4529ec30d4 100644
--- a/includes/gnutls/openpgp.h
+++ b/includes/gnutls/openpgp.h
@@ -37,7 +37,7 @@ extern "C"
 #include <gnutls/gnutls.h>
 #include <gnutls/extra.h>
 
-/* gnutls_openpgp_key_t should be defined in gnutls.h
+/* gnutls_openpgp_cert_t should be defined in gnutls.h
  */
 
   typedef enum gnutls_openpgp_key_fmt
@@ -45,15 +45,15 @@ extern "C"
     GNUTLS_OPENPGP_FMT_BASE64
   } gnutls_openpgp_key_fmt_t;
 
-  /* initializes the memory for gnutls_openpgp_key_t struct */
-  int gnutls_openpgp_key_init (gnutls_openpgp_key_t * key);
+  /* initializes the memory for gnutls_openpgp_cert_t struct */
+  int gnutls_openpgp_key_init (gnutls_openpgp_cert_t * key);
   /* frees all memory */
-  void gnutls_openpgp_key_deinit (gnutls_openpgp_key_t key);
+  void gnutls_openpgp_key_deinit (gnutls_openpgp_cert_t key);
 
-  int gnutls_openpgp_key_import (gnutls_openpgp_key_t key,
+  int gnutls_openpgp_key_import (gnutls_openpgp_cert_t key,
 				 const gnutls_datum_t * data,
 				 gnutls_openpgp_key_fmt_t format);
-  int gnutls_openpgp_key_export (gnutls_openpgp_key_t key,
+  int gnutls_openpgp_key_export (gnutls_openpgp_cert_t key,
 				 gnutls_openpgp_key_fmt_t format,
 				 void *output_data,
 				 size_t * output_data_size);
@@ -61,27 +61,27 @@ extern "C"
 /* The key_usage flags are defined in gnutls.h. They are
  * the GNUTLS_KEY_* definitions.
  */
-  int gnutls_openpgp_key_get_key_usage (gnutls_openpgp_key_t cert,
+  int gnutls_openpgp_key_get_key_usage (gnutls_openpgp_cert_t cert,
 					unsigned int *key_usage);
-  int gnutls_openpgp_key_get_fingerprint (gnutls_openpgp_key_t key, void *fpr,
+  int gnutls_openpgp_key_get_fingerprint (gnutls_openpgp_cert_t key, void *fpr,
 					  size_t * fprlen);
 
-  int gnutls_openpgp_key_get_name (gnutls_openpgp_key_t key,
+  int gnutls_openpgp_key_get_name (gnutls_openpgp_cert_t key,
 				   int idx, char *buf, size_t * sizeof_buf);
 
   gnutls_pk_algorithm_t
-  gnutls_openpgp_key_get_pk_algorithm (gnutls_openpgp_key_t key,
+  gnutls_openpgp_key_get_pk_algorithm (gnutls_openpgp_cert_t key,
 				       unsigned int *bits);
 
-  int gnutls_openpgp_key_get_version (gnutls_openpgp_key_t key);
+  int gnutls_openpgp_key_get_version (gnutls_openpgp_cert_t key);
 
-  time_t gnutls_openpgp_key_get_creation_time (gnutls_openpgp_key_t key);
-  time_t gnutls_openpgp_key_get_expiration_time (gnutls_openpgp_key_t key);
+  time_t gnutls_openpgp_key_get_creation_time (gnutls_openpgp_cert_t key);
+  time_t gnutls_openpgp_key_get_expiration_time (gnutls_openpgp_cert_t key);
 
-  int gnutls_openpgp_key_get_id (gnutls_openpgp_key_t key,
+  int gnutls_openpgp_key_get_id (gnutls_openpgp_cert_t key,
 				 unsigned char keyid[8]);
 
-  int gnutls_openpgp_key_check_hostname (gnutls_openpgp_key_t key,
+  int gnutls_openpgp_key_check_hostname (gnutls_openpgp_cert_t key,
 					 const char *hostname);
 
 /* privkey stuff.
@@ -116,12 +116,12 @@ extern "C"
 				       unsigned int flags);
 
 
-  int gnutls_openpgp_key_verify_ring (gnutls_openpgp_key_t key,
+  int gnutls_openpgp_key_verify_ring (gnutls_openpgp_cert_t key,
 				      gnutls_openpgp_keyring_t keyring,
 				      unsigned int flags, unsigned int *verify
 				      /* the output of the verification */ );
 
-  int gnutls_openpgp_key_verify_self (gnutls_openpgp_key_t key,
+  int gnutls_openpgp_key_verify_self (gnutls_openpgp_cert_t key,
 				      unsigned int flags,
 				      unsigned int *verify);
 
@@ -129,7 +129,7 @@ extern "C"
 /* certificate authentication stuff.
  */
   int gnutls_certificate_set_openpgp_key (gnutls_certificate_credentials_t
-					  res, gnutls_openpgp_key_t key,
+					  res, gnutls_openpgp_cert_t key,
 					  gnutls_openpgp_privkey_t pkey);
 
 #ifdef __cplusplus