Occurences of gnutls_openpgp_key were renamed to gnutls_openpgp_cert,

leaving an API compatibility layer.

2 files changed, 45 insertions, 26 deletions

diff --git a/includes/gnutls/gnutls.h.in b/includes/gnutls/gnutls.h.in
index ff238b36c3..7b765ff114 100644
--- a/includes/gnutls/gnutls.h.in
+++ b/includes/gnutls/gnutls.h.in
@@ -244,9 +244,11 @@ extern "C"
   } gnutls_certificate_request_t;
 
   typedef enum
-  { GNUTLS_OPENPGP_KEY,
-    GNUTLS_OPENPGP_KEY_FINGERPRINT
-  } gnutls_openpgp_key_status_t;
+  { GNUTLS_OPENPGP_CERT,
+    GNUTLS_OPENPGP_CERT_FINGERPRINT
+  } gnutls_openpgp_cert_status_t;
+#define GNUTLS_OPENPGP_KEY GNUTLS_OPENPGP_CERT
+#define GNUTLS_OPENPGP_KEY_FINGERPRINT GNUTLS_OPENPGP_CERT_FINGERPRINT
 
   typedef enum
   {
@@ -803,8 +805,10 @@ extern "C"
   void gnutls_session_set_ptr (gnutls_session_t session, void *ptr);
   void *gnutls_session_get_ptr (gnutls_session_t session);
 
-  void gnutls_openpgp_send_key (gnutls_session_t session,
-				gnutls_openpgp_key_status_t status);
+#define gnutls_openpgp_send_key gnutls_openpgp_send_cert
+#define gnutls_openpgp_key_status_t gnutls_openpgp_cert_status_t
+  void gnutls_openpgp_send_cert (gnutls_session_t session,
+				gnutls_openpgp_cert_status_t status);
 
 /* fingerprint 
  * Actually this function returns the hash of the given data.
diff --git a/includes/gnutls/openpgp.h b/includes/gnutls/openpgp.h
index 4529ec30d4..15715c649b 100644
--- a/includes/gnutls/openpgp.h
+++ b/includes/gnutls/openpgp.h
@@ -40,48 +40,63 @@ extern "C"
 /* gnutls_openpgp_cert_t should be defined in gnutls.h
  */
 
-  typedef enum gnutls_openpgp_key_fmt
+  typedef enum gnutls_openpgp_cert_fmt
   { GNUTLS_OPENPGP_FMT_RAW,
     GNUTLS_OPENPGP_FMT_BASE64
-  } gnutls_openpgp_key_fmt_t;
+  } gnutls_openpgp_cert_fmt_t;
+#define gnutls_openpgp_key_fmt_t gnutls_openpgp_cert_fmt_t
+
+#define gnutls_openpgp_key_init gnutls_openpgp_cert_init
+#define gnutls_openpgp_key_deinit gnutls_openpgp_cert_deinit
+#define gnutls_openpgp_key_import gnutls_openpgp_cert_import
+#define gnutls_openpgp_key_export gnutls_openpgp_cert_export
+#define gnutls_openpgp_key_get_key_usage gnutls_openpgp_cert_get_key_usage
+#define gnutls_openpgp_key_get_fingerprint gnutls_openpgp_cert_get_fingerprint
+#define gnutls_openpgp_key_get_pk_algorithm gnutls_openpgp_cert_get_pk_algorithm
+#define gnutls_openpgp_key_get_name gnutls_openpgp_cert_get_name
+#define gnutls_openpgp_key_get_version gnutls_openpgp_cert_get_version
+#define gnutls_openpgp_key_get_creation_time gnutls_openpgp_cert_get_creation_time
+#define gnutls_openpgp_key_get_expiration_time gnutls_openpgp_cert_get_expiration_time
+#define gnutls_openpgp_key_get_id gnutls_openpgp_cert_get_id
+#define gnutls_openpgp_key_check_hostname gnutls_openpgp_cert_check_hostname
 
   /* initializes the memory for gnutls_openpgp_cert_t struct */
-  int gnutls_openpgp_key_init (gnutls_openpgp_cert_t * key);
+  int gnutls_openpgp_cert_init (gnutls_openpgp_cert_t * key);
   /* frees all memory */
-  void gnutls_openpgp_key_deinit (gnutls_openpgp_cert_t key);
+  void gnutls_openpgp_cert_deinit (gnutls_openpgp_cert_t key);
 
-  int gnutls_openpgp_key_import (gnutls_openpgp_cert_t key,
+  int gnutls_openpgp_cert_import (gnutls_openpgp_cert_t key,
 				 const gnutls_datum_t * data,
-				 gnutls_openpgp_key_fmt_t format);
-  int gnutls_openpgp_key_export (gnutls_openpgp_cert_t key,
-				 gnutls_openpgp_key_fmt_t format,
+				 gnutls_openpgp_cert_fmt_t format);
+  int gnutls_openpgp_cert_export (gnutls_openpgp_cert_t key,
+				 gnutls_openpgp_cert_fmt_t format,
 				 void *output_data,
 				 size_t * output_data_size);
 
 /* The key_usage flags are defined in gnutls.h. They are
  * the GNUTLS_KEY_* definitions.
  */
-  int gnutls_openpgp_key_get_key_usage (gnutls_openpgp_cert_t cert,
+  int gnutls_openpgp_cert_get_key_usage (gnutls_openpgp_cert_t cert,
 					unsigned int *key_usage);
-  int gnutls_openpgp_key_get_fingerprint (gnutls_openpgp_cert_t key, void *fpr,
+  int gnutls_openpgp_cert_get_fingerprint (gnutls_openpgp_cert_t key, void *fpr,
 					  size_t * fprlen);
 
-  int gnutls_openpgp_key_get_name (gnutls_openpgp_cert_t key,
+  int gnutls_openpgp_cert_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_cert_t key,
+  gnutls_openpgp_cert_get_pk_algorithm (gnutls_openpgp_cert_t key,
 				       unsigned int *bits);
 
-  int gnutls_openpgp_key_get_version (gnutls_openpgp_cert_t key);
+  int gnutls_openpgp_cert_get_version (gnutls_openpgp_cert_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);
+  time_t gnutls_openpgp_cert_get_creation_time (gnutls_openpgp_cert_t key);
+  time_t gnutls_openpgp_cert_get_expiration_time (gnutls_openpgp_cert_t key);
 
-  int gnutls_openpgp_key_get_id (gnutls_openpgp_cert_t key,
+  int gnutls_openpgp_cert_get_id (gnutls_openpgp_cert_t key,
 				 unsigned char keyid[8]);
 
-  int gnutls_openpgp_key_check_hostname (gnutls_openpgp_cert_t key,
+  int gnutls_openpgp_cert_check_hostname (gnutls_openpgp_cert_t key,
 					 const char *hostname);
 
 /* privkey stuff.
@@ -93,7 +108,7 @@ extern "C"
 					   unsigned int *bits);
   int gnutls_openpgp_privkey_import (gnutls_openpgp_privkey_t key,
 				     const gnutls_datum_t * data,
-				     gnutls_openpgp_key_fmt_t format,
+				     gnutls_openpgp_cert_fmt_t format,
 				     const char *pass, unsigned int flags);
   int gnutls_openpgp_privkey_sign_hash (gnutls_openpgp_privkey_t key,
 					const gnutls_datum_t * hash,
@@ -109,19 +124,19 @@ extern "C"
 
   int gnutls_openpgp_keyring_import (gnutls_openpgp_keyring_t keyring,
 				     const gnutls_datum_t * data,
-				     gnutls_openpgp_key_fmt_t format);
+				     gnutls_openpgp_cert_fmt_t format);
 
   int gnutls_openpgp_keyring_check_id (gnutls_openpgp_keyring_t ring,
 				       const unsigned char keyid[8],
 				       unsigned int flags);
 
 
-  int gnutls_openpgp_key_verify_ring (gnutls_openpgp_cert_t key,
+  int gnutls_openpgp_cert_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_cert_t key,
+  int gnutls_openpgp_cert_verify_self (gnutls_openpgp_cert_t key,
 				      unsigned int flags,
 				      unsigned int *verify);