Use *_t types consistently.

4 files changed, 26 insertions, 22 deletions

diff --git a/includes/gnutls/gnutls.h.in b/includes/gnutls/gnutls.h.in
index 801c82cafe..e448a03ebd 100644
--- a/includes/gnutls/gnutls.h.in
+++ b/includes/gnutls/gnutls.h.in
@@ -539,7 +539,7 @@ extern "C"
   int gnutls_session_get_data (gnutls_session_t session, void *session_data,
 			       size_t * session_data_size);
   int gnutls_session_get_data2 (gnutls_session_t session,
-				gnutls_datum * data);
+				gnutls_datum_t * data);
 
 /* returns the session ID */
 #define GNUTLS_MAX_SESSION_ID 32
@@ -924,7 +924,7 @@ extern "C"
 					      * sc);
   int gnutls_psk_set_client_credentials (gnutls_psk_client_credentials_t res,
 					 const char *username,
-					 const gnutls_datum * key,
+					 const gnutls_datum_t * key,
 					 gnutls_psk_key_flags format);
 
   void gnutls_psk_free_server_credentials (gnutls_psk_server_credentials_t
@@ -946,7 +946,7 @@ extern "C"
 
   typedef int gnutls_psk_client_credentials_function (gnutls_session_t,
 						      char **username,
-						      gnutls_datum * key);
+						      gnutls_datum_t * key);
   void
     gnutls_psk_set_client_credentials_function
     (gnutls_psk_client_credentials_t cred,
diff --git a/includes/gnutls/gnutlsxx.h b/includes/gnutls/gnutlsxx.h
index 555900a4d8..be1fe5a0e3 100644
--- a/includes/gnutls/gnutlsxx.h
+++ b/includes/gnutls/gnutlsxx.h
@@ -172,10 +172,10 @@ class session
         unsigned int get_dh_prime_bits() const;
         void get_dh_group( gnutls_datum_t & gen, gnutls_datum_t & prime) const;
         void get_dh_pubkey( gnutls_datum_t & raw_key) const;
-        void get_rsa_export_pubkey( gnutls_datum& exponent, gnutls_datum& modulus) const;
+        void get_rsa_export_pubkey( gnutls_datum_t& exponent, gnutls_datum_t& modulus) const;
         unsigned int get_rsa_export_modulus_bits() const;
         
-        void get_our_certificate(gnutls_datum & cert) const;
+        void get_our_certificate(gnutls_datum_t & cert) const;
         bool get_peers_certificate(std::vector<gnutls_datum_t> &out_certs) const;
         bool get_peers_certificate(const gnutls_datum_t** certs, unsigned int *certs_size) const;
 
@@ -190,9 +190,9 @@ class DB
 {
     public:
         virtual ~DB()=0;
-        virtual bool store( const gnutls_datum& key, const gnutls_datum& data)=0;
-        virtual bool retrieve( const gnutls_datum& key, gnutls_datum& data)=0;
-        virtual bool remove( const gnutls_datum& key)=0;
+        virtual bool store( const gnutls_datum_t& key, const gnutls_datum_t& data)=0;
+        virtual bool retrieve( const gnutls_datum_t& key, gnutls_datum_t& data)=0;
+        virtual bool remove( const gnutls_datum_t& key)=0;
 };
 
 class server_session: public session
diff --git a/includes/gnutls/openpgp.h b/includes/gnutls/openpgp.h
index be7a2b5297..229e58176e 100644
--- a/includes/gnutls/openpgp.h
+++ b/includes/gnutls/openpgp.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation
+ * Copyright (C) 2003, 2004, 2005, 2006, 2007 Free Software Foundation
  *
  * Author: Nikos Mavroyanopoulos
  *
@@ -43,14 +43,16 @@ extern "C"
   typedef enum gnutls_openpgp_key_fmt
   { GNUTLS_OPENPGP_FMT_RAW,
     GNUTLS_OPENPGP_FMT_BASE64
-  } gnutls_openpgp_key_fmt;
+  } gnutls_openpgp_key_fmt_t;
 
-  int gnutls_openpgp_key_init (gnutls_openpgp_key * key);	/* initializes the memory for gnutls_openpgp_key_t struct */
-  void gnutls_openpgp_key_deinit (gnutls_openpgp_key_t key);	/* frees all memory */
+  /* initializes the memory for gnutls_openpgp_key_t struct */
+  int gnutls_openpgp_key_init (gnutls_openpgp_key_t * key);
+  /* frees all memory */
+  void gnutls_openpgp_key_deinit (gnutls_openpgp_key_t key);
 
   int gnutls_openpgp_key_import (gnutls_openpgp_key_t key,
 				 const gnutls_datum_t * data,
-				 gnutls_openpgp_key_fmt format);
+				 gnutls_openpgp_key_fmt_t format);
   int gnutls_openpgp_key_export (gnutls_openpgp_key_t key,
 				 gnutls_openpgp_key_fmt_t format,
 				 void *output_data,
@@ -94,20 +96,20 @@ extern "C"
 					   unsigned int *bits);
   int gnutls_openpgp_privkey_import (gnutls_openpgp_privkey_t key,
 				     const gnutls_datum_t * data,
-				     gnutls_openpgp_key_fmt format,
+				     gnutls_openpgp_key_fmt_t format,
 				     const char *pass, unsigned int flags);
 
 /* Keyring stuff.
  */
   struct gnutls_openpgp_keyring_int;	/* object to hold (parsed) openpgp keyrings */
-  typedef struct gnutls_openpgp_keyring_int *gnutls_openpgp_keyring;
+  typedef struct gnutls_openpgp_keyring_int *gnutls_openpgp_keyring_t;
 
-  int gnutls_openpgp_keyring_init (gnutls_openpgp_keyring * keyring);
+  int gnutls_openpgp_keyring_init (gnutls_openpgp_keyring_t * keyring);
   void gnutls_openpgp_keyring_deinit (gnutls_openpgp_keyring_t keyring);
 
   int gnutls_openpgp_keyring_import (gnutls_openpgp_keyring_t keyring,
 				     const gnutls_datum_t * data,
-				     gnutls_openpgp_key_fmt format);
+				     gnutls_openpgp_key_fmt_t format);
 
   int gnutls_openpgp_keyring_check_id (gnutls_openpgp_keyring_t ring,
 				       const unsigned char keyid[8],
@@ -116,9 +118,9 @@ extern "C"
 /* Trustdb functions.
  */
   struct gnutls_openpgp_trustdb_int;	/* object to hold (parsed) openpgp trustdbs */
-  typedef struct gnutls_openpgp_trustdb_int *gnutls_openpgp_trustdb;
+  typedef struct gnutls_openpgp_trustdb_int *gnutls_openpgp_trustdb_t;
 
-  int gnutls_openpgp_trustdb_init (gnutls_openpgp_trustdb * trustdb);
+  int gnutls_openpgp_trustdb_init (gnutls_openpgp_trustdb_t * trustdb);
   void gnutls_openpgp_trustdb_deinit (gnutls_openpgp_trustdb_t trustdb);
 
   int gnutls_openpgp_trustdb_import (gnutls_openpgp_trustdb_t trustdb,
diff --git a/includes/gnutls/pkcs12.h b/includes/gnutls/pkcs12.h
index c46da6f3bc..ba330a4ddb 100644
--- a/includes/gnutls/pkcs12.h
+++ b/includes/gnutls/pkcs12.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2003, 2004, 2005 Free Software Foundation
+ * Copyright (C) 2003, 2004, 2005, 2007 Free Software Foundation
  *
  * Author: Nikos Mavroyanopoulos
  *
@@ -44,9 +44,11 @@ extern "C"
   void gnutls_pkcs12_deinit (gnutls_pkcs12_t pkcs12);
   int gnutls_pkcs12_import (gnutls_pkcs12_t pkcs12,
 			    const gnutls_datum_t * data,
-			    gnutls_x509_crt_fmt format, unsigned int flags);
+			    gnutls_x509_crt_fmt_t format,
+			    unsigned int flags);
   int gnutls_pkcs12_export (gnutls_pkcs12_t pkcs12,
-			    gnutls_x509_crt_fmt format, void *output_data,
+			    gnutls_x509_crt_fmt_t format,
+			    void *output_data,
 			    size_t * output_data_size);
 
   int gnutls_pkcs12_get_bag (gnutls_pkcs12_t pkcs12,