glib2 2.0.2-x86-mingw32 → 2.0.3-x86-mingw32

data/vendor/local/include/gnutls/compat.h

@@ -25,10 +25,11 @@
 #ifndef _GNUTLS_COMPAT_H
 #define _GNUTLS_COMPAT_H
 
+/* *INDENT-OFF* */
 #ifdef __cplusplus
-extern "C"
-{
+extern "C" {
 #endif
+/* *INDENT-ON* */
 
 #ifdef __GNUC__
 
@@ -40,7 +41,7 @@ extern "C"
 #endif
 #endif
 
-#endif /* __GNUC__ */
+#endif				/* __GNUC__ */
 
 #ifndef _GNUTLS_GCC_ATTR_DEPRECATED
 #define _GNUTLS_GCC_ATTR_DEPRECATED
@@ -50,40 +51,67 @@ extern "C"
 typedef unsigned int gnutls_connection_end_t _GNUTLS_GCC_ATTR_DEPRECATED;
 
 /* Stuff deprected in 2.x */
-typedef gnutls_cipher_algorithm_t gnutls_cipher_algorithm _GNUTLS_GCC_ATTR_DEPRECATED;
-typedef gnutls_kx_algorithm_t gnutls_kx_algorithm _GNUTLS_GCC_ATTR_DEPRECATED;
-typedef gnutls_mac_algorithm_t gnutls_mac_algorithm _GNUTLS_GCC_ATTR_DEPRECATED;
-typedef gnutls_digest_algorithm_t gnutls_digest_algorithm _GNUTLS_GCC_ATTR_DEPRECATED;
-typedef gnutls_compression_method_t gnutls_compression_method _GNUTLS_GCC_ATTR_DEPRECATED;
-typedef gnutls_connection_end_t gnutls_connection_end _GNUTLS_GCC_ATTR_DEPRECATED;
-typedef gnutls_x509_crt_fmt_t gnutls_x509_crt_fmt _GNUTLS_GCC_ATTR_DEPRECATED;
-typedef gnutls_pk_algorithm_t gnutls_pk_algorithm _GNUTLS_GCC_ATTR_DEPRECATED;
-typedef gnutls_sign_algorithm_t gnutls_sign_algorithm _GNUTLS_GCC_ATTR_DEPRECATED;
-typedef gnutls_close_request_t gnutls_close_request _GNUTLS_GCC_ATTR_DEPRECATED;
-typedef gnutls_certificate_request_t gnutls_certificate_request _GNUTLS_GCC_ATTR_DEPRECATED;
-typedef gnutls_certificate_status_t gnutls_certificate_status _GNUTLS_GCC_ATTR_DEPRECATED;
+typedef gnutls_cipher_algorithm_t gnutls_cipher_algorithm
+    _GNUTLS_GCC_ATTR_DEPRECATED;
+typedef gnutls_kx_algorithm_t gnutls_kx_algorithm
+    _GNUTLS_GCC_ATTR_DEPRECATED;
+typedef gnutls_mac_algorithm_t gnutls_mac_algorithm
+    _GNUTLS_GCC_ATTR_DEPRECATED;
+typedef gnutls_digest_algorithm_t gnutls_digest_algorithm
+    _GNUTLS_GCC_ATTR_DEPRECATED;
+typedef gnutls_compression_method_t gnutls_compression_method
+    _GNUTLS_GCC_ATTR_DEPRECATED;
+typedef gnutls_connection_end_t gnutls_connection_end
+    _GNUTLS_GCC_ATTR_DEPRECATED;
+typedef gnutls_x509_crt_fmt_t gnutls_x509_crt_fmt
+    _GNUTLS_GCC_ATTR_DEPRECATED;
+typedef gnutls_pk_algorithm_t gnutls_pk_algorithm
+    _GNUTLS_GCC_ATTR_DEPRECATED;
+typedef gnutls_sign_algorithm_t gnutls_sign_algorithm
+    _GNUTLS_GCC_ATTR_DEPRECATED;
+typedef gnutls_close_request_t gnutls_close_request
+    _GNUTLS_GCC_ATTR_DEPRECATED;
+typedef gnutls_certificate_request_t gnutls_certificate_request
+    _GNUTLS_GCC_ATTR_DEPRECATED;
+typedef gnutls_certificate_status_t gnutls_certificate_status
+    _GNUTLS_GCC_ATTR_DEPRECATED;
 typedef gnutls_session_t gnutls_session _GNUTLS_GCC_ATTR_DEPRECATED;
-typedef gnutls_alert_level_t gnutls_alert_level _GNUTLS_GCC_ATTR_DEPRECATED;
-typedef gnutls_alert_description_t gnutls_alert_description _GNUTLS_GCC_ATTR_DEPRECATED;
-typedef gnutls_x509_subject_alt_name_t gnutls_x509_subject_alt_name _GNUTLS_GCC_ATTR_DEPRECATED;
-typedef gnutls_openpgp_privkey_t gnutls_openpgp_privkey _GNUTLS_GCC_ATTR_DEPRECATED;
-typedef gnutls_openpgp_keyring_t gnutls_openpgp_keyring _GNUTLS_GCC_ATTR_DEPRECATED;
+typedef gnutls_alert_level_t gnutls_alert_level
+    _GNUTLS_GCC_ATTR_DEPRECATED;
+typedef gnutls_alert_description_t gnutls_alert_description
+    _GNUTLS_GCC_ATTR_DEPRECATED;
+typedef gnutls_x509_subject_alt_name_t gnutls_x509_subject_alt_name
+    _GNUTLS_GCC_ATTR_DEPRECATED;
+typedef gnutls_openpgp_privkey_t gnutls_openpgp_privkey
+    _GNUTLS_GCC_ATTR_DEPRECATED;
+typedef gnutls_openpgp_keyring_t gnutls_openpgp_keyring
+    _GNUTLS_GCC_ATTR_DEPRECATED;
 typedef gnutls_x509_crt_t gnutls_x509_crt _GNUTLS_GCC_ATTR_DEPRECATED;
-typedef gnutls_x509_privkey_t gnutls_x509_privkey _GNUTLS_GCC_ATTR_DEPRECATED;
+typedef gnutls_x509_privkey_t gnutls_x509_privkey
+    _GNUTLS_GCC_ATTR_DEPRECATED;
 typedef gnutls_x509_crl_t gnutls_x509_crl _GNUTLS_GCC_ATTR_DEPRECATED;
 typedef gnutls_x509_crq_t gnutls_x509_crq _GNUTLS_GCC_ATTR_DEPRECATED;
-typedef gnutls_certificate_credentials_t gnutls_certificate_credentials _GNUTLS_GCC_ATTR_DEPRECATED;
-typedef gnutls_anon_server_credentials_t gnutls_anon_server_credentials _GNUTLS_GCC_ATTR_DEPRECATED;
-typedef gnutls_anon_client_credentials_t gnutls_anon_client_credentials _GNUTLS_GCC_ATTR_DEPRECATED;
-typedef gnutls_srp_client_credentials_t gnutls_srp_client_credentials _GNUTLS_GCC_ATTR_DEPRECATED;
-typedef gnutls_srp_server_credentials_t gnutls_srp_server_credentials _GNUTLS_GCC_ATTR_DEPRECATED;
+typedef gnutls_certificate_credentials_t
+    gnutls_certificate_credentials _GNUTLS_GCC_ATTR_DEPRECATED;
+typedef gnutls_anon_server_credentials_t
+    gnutls_anon_server_credentials _GNUTLS_GCC_ATTR_DEPRECATED;
+typedef gnutls_anon_client_credentials_t
+    gnutls_anon_client_credentials _GNUTLS_GCC_ATTR_DEPRECATED;
+typedef gnutls_srp_client_credentials_t
+    gnutls_srp_client_credentials _GNUTLS_GCC_ATTR_DEPRECATED;
+typedef gnutls_srp_server_credentials_t
+    gnutls_srp_server_credentials _GNUTLS_GCC_ATTR_DEPRECATED;
 typedef gnutls_dh_params_t gnutls_dh_params _GNUTLS_GCC_ATTR_DEPRECATED;
 typedef gnutls_rsa_params_t gnutls_rsa_params _GNUTLS_GCC_ATTR_DEPRECATED;
-typedef gnutls_params_type_t gnutls_params_type _GNUTLS_GCC_ATTR_DEPRECATED;
-typedef gnutls_credentials_type_t gnutls_credentials_type _GNUTLS_GCC_ATTR_DEPRECATED;
-typedef gnutls_certificate_type_t gnutls_certificate_type _GNUTLS_GCC_ATTR_DEPRECATED;
+typedef gnutls_params_type_t gnutls_params_type
+    _GNUTLS_GCC_ATTR_DEPRECATED;
+typedef gnutls_credentials_type_t gnutls_credentials_type
+    _GNUTLS_GCC_ATTR_DEPRECATED;
+typedef gnutls_certificate_type_t gnutls_certificate_type
+    _GNUTLS_GCC_ATTR_DEPRECATED;
 typedef gnutls_datum_t gnutls_datum _GNUTLS_GCC_ATTR_DEPRECATED;
-typedef gnutls_transport_ptr_t gnutls_transport_ptr _GNUTLS_GCC_ATTR_DEPRECATED;
+typedef gnutls_transport_ptr_t gnutls_transport_ptr
+    _GNUTLS_GCC_ATTR_DEPRECATED;
 
 /* Old SRP alerts removed in 2.1.x because the TLS-SRP RFC was
    modified to use the PSK alert. */
@@ -94,8 +122,10 @@ typedef gnutls_transport_ptr_t gnutls_transport_ptr _GNUTLS_GCC_ATTR_DEPRECATED;
 #define GNUTLS_OPENPGP_KEY GNUTLS_OPENPGP_CERT
 #define GNUTLS_OPENPGP_KEY_FINGERPRINT GNUTLS_OPENPGP_CERT_FINGERPRINT
 #define gnutls_openpgp_send_key gnutls_openpgp_send_cert
-typedef gnutls_openpgp_crt_status_t gnutls_openpgp_key_status_t _GNUTLS_GCC_ATTR_DEPRECATED;
-typedef gnutls_openpgp_crt_t gnutls_openpgp_key_t _GNUTLS_GCC_ATTR_DEPRECATED;
+typedef gnutls_openpgp_crt_status_t gnutls_openpgp_key_status_t
+    _GNUTLS_GCC_ATTR_DEPRECATED;
+typedef gnutls_openpgp_crt_t gnutls_openpgp_key_t
+    _GNUTLS_GCC_ATTR_DEPRECATED;
 #define gnutls_openpgp_key_init gnutls_openpgp_crt_init
 #define gnutls_openpgp_key_deinit gnutls_openpgp_crt_deinit
 #define gnutls_openpgp_key_import gnutls_openpgp_crt_import
@@ -130,210 +160,242 @@ typedef gnutls_openpgp_crt_t gnutls_openpgp_key_t _GNUTLS_GCC_ATTR_DEPRECATED;
 /* The gnutls_retr_st was deprecated by gnutls_certificate_retrieve_function()
  * and gnutls_retr2_st.
  */
-typedef struct gnutls_retr_st
-{
-  gnutls_certificate_type_t type;
-  union
-  {
-    gnutls_x509_crt_t *x509;
-    gnutls_openpgp_crt_t pgp;
-  } cert;
-  unsigned int ncerts;          /* one for pgp keys */
-
-  union
-  {
-    gnutls_x509_privkey_t x509;
-    gnutls_openpgp_privkey_t pgp;
-  } key;
-
-  unsigned int deinit_all;      /* if non zero all keys will be deinited */
+typedef struct gnutls_retr_st {
+	gnutls_certificate_type_t type;
+	union {
+		gnutls_x509_crt_t *x509;
+		gnutls_openpgp_crt_t pgp;
+	} cert;
+	unsigned int ncerts;	/* one for pgp keys */
+
+	union {
+		gnutls_x509_privkey_t x509;
+		gnutls_openpgp_privkey_t pgp;
+	} key;
+
+	unsigned int deinit_all;	/* if non zero all keys will be deinited */
 } gnutls_retr_st;
 
-typedef int gnutls_certificate_client_retrieve_function (gnutls_session_t,
-                                                         const
-                                                         gnutls_datum_t *
-                                                         req_ca_rdn,
-                                                         int nreqs,
-                                                         const
-                                                         gnutls_pk_algorithm_t
-                                                         * pk_algos,
-                                                         int
-                                                         pk_algos_length,
-                                                         gnutls_retr_st *);
-typedef int gnutls_certificate_server_retrieve_function (gnutls_session_t,
-                                                         gnutls_retr_st *);
+typedef int
+gnutls_certificate_client_retrieve_function(gnutls_session_t,
+					    const
+					    gnutls_datum_t *
+					    req_ca_rdn,
+					    int nreqs, const
+					    gnutls_pk_algorithm_t
+					    * pk_algos, int
+					    pk_algos_length,
+					    gnutls_retr_st *);
+typedef int
+gnutls_certificate_server_retrieve_function(gnutls_session_t,
+					    gnutls_retr_st *);
 
 void gnutls_certificate_client_set_retrieve_function
-  (gnutls_certificate_credentials_t cred,
-   gnutls_certificate_client_retrieve_function *
-   func) _GNUTLS_GCC_ATTR_DEPRECATED;
+    (gnutls_certificate_credentials_t cred,
+     gnutls_certificate_client_retrieve_function *
+     func) _GNUTLS_GCC_ATTR_DEPRECATED;
 void
-  gnutls_certificate_server_set_retrieve_function
-  (gnutls_certificate_credentials_t cred,
-   gnutls_certificate_server_retrieve_function *
-   func) _GNUTLS_GCC_ATTR_DEPRECATED;
+ gnutls_certificate_server_set_retrieve_function
+    (gnutls_certificate_credentials_t cred,
+     gnutls_certificate_server_retrieve_function *
+     func) _GNUTLS_GCC_ATTR_DEPRECATED;
 
-  /* External signing callback.  No longer supported because it
-   * was deprecated by the PKCS #11 API or gnutls_privkey_import_ext. */
+	/* External signing callback.  No longer supported because it
+	 * was deprecated by the PKCS #11 API or gnutls_privkey_import_ext. */
 typedef int (*gnutls_sign_func) (gnutls_session_t session,
-                                 void *userdata,
-                                 gnutls_certificate_type_t cert_type,
-                                 const gnutls_datum_t * cert,
-                                 const gnutls_datum_t * hash,
-                                 gnutls_datum_t * signature);
+				 void *userdata,
+				 gnutls_certificate_type_t
+				 cert_type,
+				 const gnutls_datum_t * cert,
+				 const gnutls_datum_t * hash,
+				 gnutls_datum_t * signature);
 
 void
-gnutls_sign_callback_set (gnutls_session_t session,
-                          gnutls_sign_func sign_func, void *userdata)
-  _GNUTLS_GCC_ATTR_DEPRECATED;
+gnutls_sign_callback_set(gnutls_session_t session,
+			 gnutls_sign_func sign_func,
+			 void *userdata) _GNUTLS_GCC_ATTR_DEPRECATED;
 gnutls_sign_func
-gnutls_sign_callback_get (gnutls_session_t session, void **userdata)
- _GNUTLS_GCC_ATTR_DEPRECATED;
+gnutls_sign_callback_get(gnutls_session_t session,
+			 void **userdata) _GNUTLS_GCC_ATTR_DEPRECATED;
 
 /* This is a very dangerous and error-prone function.
  * Use gnutls_privkey_sign_hash() instead.
  */
-  int gnutls_x509_privkey_sign_hash (gnutls_x509_privkey_t key,
-                                        const gnutls_datum_t * hash,
-                                        gnutls_datum_t * signature)
-                                        _GNUTLS_GCC_ATTR_DEPRECATED;
+int gnutls_x509_privkey_sign_hash(gnutls_x509_privkey_t key,
+				  const gnutls_datum_t * hash,
+				  gnutls_datum_t * signature)
+    _GNUTLS_GCC_ATTR_DEPRECATED;
 
-  int gnutls_openpgp_privkey_sign_hash (gnutls_openpgp_privkey_t key,
-                                       const gnutls_datum_t * hash,
-                                       gnutls_datum_t * signature)
-                                       _GNUTLS_GCC_ATTR_DEPRECATED;
+int gnutls_openpgp_privkey_sign_hash(gnutls_openpgp_privkey_t key,
+				     const gnutls_datum_t * hash,
+				     gnutls_datum_t * signature)
+    _GNUTLS_GCC_ATTR_DEPRECATED;
 
 /* we support the gnutls_privkey_sign_data() instead.
  */
-  int gnutls_x509_privkey_sign_data (gnutls_x509_privkey_t key,
-                                     gnutls_digest_algorithm_t digest,
-                                     unsigned int flags,
-                                     const gnutls_datum_t * data,
-                                     void *signature,
-                                     size_t * signature_size)
-                                     _GNUTLS_GCC_ATTR_DEPRECATED;
-
-  /* gnutls_pubkey_verify_data() */
-  int gnutls_x509_crt_verify_data (gnutls_x509_crt_t crt,
-                                   unsigned int flags,
-                                   const gnutls_datum_t * data,
-                                   const gnutls_datum_t * signature)
-                                   _GNUTLS_GCC_ATTR_DEPRECATED;
-
-
-  /* gnutls_pubkey_verify_hash() */
-  int gnutls_x509_crt_verify_hash (gnutls_x509_crt_t crt,
-                                   unsigned int flags,
-                                   const gnutls_datum_t * hash,
-                                   const gnutls_datum_t * signature)
-                                   _GNUTLS_GCC_ATTR_DEPRECATED;
-
-  /* gnutls_pubkey_get_verify_algorithm() */
-  int gnutls_x509_crt_get_verify_algorithm (gnutls_x509_crt_t crt,
-                                            const gnutls_datum_t * signature,
-                                            gnutls_digest_algorithm_t * hash)
-                                            _GNUTLS_GCC_ATTR_DEPRECATED;
-
-  /* gnutls_pubkey_get_preferred_hash_algorithm() */
-  int gnutls_x509_crt_get_preferred_hash_algorithm (gnutls_x509_crt_t crt,
-                                                    gnutls_digest_algorithm_t
-                                                    * hash,
-                                                    unsigned int *mand)
-                                                    _GNUTLS_GCC_ATTR_DEPRECATED;
-
-  /* gnutls_x509_crq_privkey_sign() */
-  int gnutls_x509_crq_sign (gnutls_x509_crq_t crq, gnutls_x509_privkey_t key)
-                              _GNUTLS_GCC_ATTR_DEPRECATED;
-
-
-
-  /* gnutls_x509_crl_privkey_sign */
-  int gnutls_x509_crl_sign (gnutls_x509_crl_t crl,
-                            gnutls_x509_crt_t issuer,
-                            gnutls_x509_privkey_t issuer_key)
-                            _GNUTLS_GCC_ATTR_DEPRECATED;
-
-  /* functions to set priority of cipher suites
-   */
-  int gnutls_cipher_set_priority (gnutls_session_t session, const int *list)
-  _GNUTLS_GCC_ATTR_DEPRECATED;
-  int gnutls_mac_set_priority (gnutls_session_t session, const int *list)
-  _GNUTLS_GCC_ATTR_DEPRECATED;
-  int gnutls_compression_set_priority (gnutls_session_t session,
-                                       const int *list)
-                                       _GNUTLS_GCC_ATTR_DEPRECATED;
-  int gnutls_kx_set_priority (gnutls_session_t session, const int *list)
-  _GNUTLS_GCC_ATTR_DEPRECATED;
-  int gnutls_protocol_set_priority (gnutls_session_t session,
-                                    const int *list)
-                                    _GNUTLS_GCC_ATTR_DEPRECATED;
-  int gnutls_certificate_type_set_priority (gnutls_session_t session,
-                                            const int *list)
-                                            _GNUTLS_GCC_ATTR_DEPRECATED;
+int gnutls_x509_privkey_sign_data(gnutls_x509_privkey_t key,
+				  gnutls_digest_algorithm_t digest,
+				  unsigned int flags,
+				  const gnutls_datum_t * data,
+				  void *signature,
+				  size_t * signature_size)
+    _GNUTLS_GCC_ATTR_DEPRECATED;
+
+	/* gnutls_pubkey_verify_data() */
+int gnutls_x509_crt_verify_data(gnutls_x509_crt_t crt,
+				unsigned int flags,
+				const gnutls_datum_t * data,
+				const gnutls_datum_t * signature)
+    _GNUTLS_GCC_ATTR_DEPRECATED;
+
+
+	/* gnutls_pubkey_verify_hash() */
+int gnutls_x509_crt_verify_hash(gnutls_x509_crt_t crt,
+				unsigned int flags,
+				const gnutls_datum_t * hash,
+				const gnutls_datum_t * signature)
+    _GNUTLS_GCC_ATTR_DEPRECATED;
+
+	/* gnutls_pubkey_get_verify_algorithm() */
+int gnutls_x509_crt_get_verify_algorithm(gnutls_x509_crt_t crt,
+					 const gnutls_datum_t *
+					 signature,
+					 gnutls_digest_algorithm_t
+					 * hash)
+    _GNUTLS_GCC_ATTR_DEPRECATED;
+
+	/* gnutls_pubkey_get_preferred_hash_algorithm() */
+int gnutls_x509_crt_get_preferred_hash_algorithm(gnutls_x509_crt_t
+						 crt,
+						 gnutls_digest_algorithm_t
+						 * hash, unsigned int
+						 *mand)
+    _GNUTLS_GCC_ATTR_DEPRECATED;
+
+	/* gnutls_x509_crq_privkey_sign() */
+int gnutls_x509_crq_sign(gnutls_x509_crq_t crq,
+			 gnutls_x509_privkey_t key)
+    _GNUTLS_GCC_ATTR_DEPRECATED;
+
+
+
+	/* gnutls_x509_crl_privkey_sign */
+int gnutls_x509_crl_sign(gnutls_x509_crl_t crl,
+			 gnutls_x509_crt_t issuer,
+			 gnutls_x509_privkey_t issuer_key)
+    _GNUTLS_GCC_ATTR_DEPRECATED;
+
+	/* functions to set priority of cipher suites
+	 */
+int gnutls_cipher_set_priority(gnutls_session_t session,
+			       const int *list)
+    _GNUTLS_GCC_ATTR_DEPRECATED;
+int gnutls_mac_set_priority(gnutls_session_t session,
+			    const int *list) _GNUTLS_GCC_ATTR_DEPRECATED;
+int gnutls_compression_set_priority(gnutls_session_t session,
+				    const int *list)
+    _GNUTLS_GCC_ATTR_DEPRECATED;
+int gnutls_kx_set_priority(gnutls_session_t session,
+			   const int *list) _GNUTLS_GCC_ATTR_DEPRECATED;
+int gnutls_protocol_set_priority(gnutls_session_t session,
+				 const int *list)
+    _GNUTLS_GCC_ATTR_DEPRECATED;
+int gnutls_certificate_type_set_priority(gnutls_session_t session,
+					 const int *list)
+    _GNUTLS_GCC_ATTR_DEPRECATED;
 
 /* RSA params 
  */
-  int gnutls_rsa_params_init (gnutls_rsa_params_t * rsa_params) _GNUTLS_GCC_ATTR_DEPRECATED;
-  void gnutls_rsa_params_deinit (gnutls_rsa_params_t rsa_params) _GNUTLS_GCC_ATTR_DEPRECATED;
-  int gnutls_rsa_params_cpy (gnutls_rsa_params_t dst,
-                             gnutls_rsa_params_t src) _GNUTLS_GCC_ATTR_DEPRECATED;
-  int gnutls_rsa_params_import_raw (gnutls_rsa_params_t rsa_params,
-                                    const gnutls_datum_t * m,
-                                    const gnutls_datum_t * e,
-                                    const gnutls_datum_t * d,
-                                    const gnutls_datum_t * p,
-                                    const gnutls_datum_t * q,
-                                    const gnutls_datum_t * u);
-  int gnutls_rsa_params_generate2 (gnutls_rsa_params_t params,
-                                   unsigned int bits) _GNUTLS_GCC_ATTR_DEPRECATED;
-  int gnutls_rsa_params_export_raw (gnutls_rsa_params_t rsa,
-                                    gnutls_datum_t * m, gnutls_datum_t * e,
-                                    gnutls_datum_t * d, gnutls_datum_t * p,
-                                    gnutls_datum_t * q, gnutls_datum_t * u,
-                                    unsigned int *bits) _GNUTLS_GCC_ATTR_DEPRECATED;
-  int gnutls_rsa_params_export_pkcs1 (gnutls_rsa_params_t params,
-                                      gnutls_x509_crt_fmt_t format,
-                                      unsigned char *params_data,
-                                      size_t * params_data_size) _GNUTLS_GCC_ATTR_DEPRECATED;
-  int gnutls_rsa_params_import_pkcs1 (gnutls_rsa_params_t params,
-                                      const gnutls_datum_t * pkcs1_params,
-                                      gnutls_x509_crt_fmt_t format) _GNUTLS_GCC_ATTR_DEPRECATED;
-
-  int gnutls_rsa_export_get_pubkey (gnutls_session_t session,
-                                    gnutls_datum_t * exponent,
-                                    gnutls_datum_t * modulus) _GNUTLS_GCC_ATTR_DEPRECATED;
-  int gnutls_rsa_export_get_modulus_bits (gnutls_session_t session) _GNUTLS_GCC_ATTR_DEPRECATED;
-  int gnutls_set_default_export_priority (gnutls_session_t session) _GNUTLS_GCC_ATTR_DEPRECATED;
-
-  void
-    gnutls_certificate_set_rsa_export_params (gnutls_certificate_credentials_t
-                                              res,
-                                              gnutls_rsa_params_t rsa_params) _GNUTLS_GCC_ATTR_DEPRECATED;
+int gnutls_rsa_params_init(gnutls_rsa_params_t *
+			   rsa_params) _GNUTLS_GCC_ATTR_DEPRECATED;
+void gnutls_rsa_params_deinit(gnutls_rsa_params_t rsa_params)
+    _GNUTLS_GCC_ATTR_DEPRECATED;
+int gnutls_rsa_params_cpy(gnutls_rsa_params_t dst,
+			  gnutls_rsa_params_t src)
+    _GNUTLS_GCC_ATTR_DEPRECATED;
+int gnutls_rsa_params_import_raw(gnutls_rsa_params_t rsa_params,
+				 const gnutls_datum_t * m,
+				 const gnutls_datum_t * e,
+				 const gnutls_datum_t * d,
+				 const gnutls_datum_t * p,
+				 const gnutls_datum_t * q,
+				 const gnutls_datum_t * u);
+int gnutls_rsa_params_generate2(gnutls_rsa_params_t params,
+				unsigned int bits)
+    _GNUTLS_GCC_ATTR_DEPRECATED;
+int gnutls_rsa_params_export_raw(gnutls_rsa_params_t rsa,
+				 gnutls_datum_t * m,
+				 gnutls_datum_t * e,
+				 gnutls_datum_t * d,
+				 gnutls_datum_t * p,
+				 gnutls_datum_t * q,
+				 gnutls_datum_t * u,
+				 unsigned int *bits)
+    _GNUTLS_GCC_ATTR_DEPRECATED;
+int gnutls_rsa_params_export_pkcs1(gnutls_rsa_params_t params,
+				   gnutls_x509_crt_fmt_t format,
+				   unsigned char *params_data,
+				   size_t *
+				   params_data_size)
+    _GNUTLS_GCC_ATTR_DEPRECATED;
+int gnutls_rsa_params_import_pkcs1(gnutls_rsa_params_t params,
+				   const gnutls_datum_t *
+				   pkcs1_params,
+				   gnutls_x509_crt_fmt_t format)
+    _GNUTLS_GCC_ATTR_DEPRECATED;
+
+int gnutls_rsa_export_get_pubkey(gnutls_session_t session,
+				 gnutls_datum_t * exponent,
+				 gnutls_datum_t *
+				 modulus) _GNUTLS_GCC_ATTR_DEPRECATED;
+int gnutls_rsa_export_get_modulus_bits(gnutls_session_t session)
+    _GNUTLS_GCC_ATTR_DEPRECATED;
+int gnutls_set_default_export_priority(gnutls_session_t session)
+    _GNUTLS_GCC_ATTR_DEPRECATED;
+
+void gnutls_certificate_set_rsa_export_params
+    (gnutls_certificate_credentials_t res,
+     gnutls_rsa_params_t rsa_params) _GNUTLS_GCC_ATTR_DEPRECATED;
+
+	/* use gnutls_privkey_sign_hash() with the GNUTLS_PRIVKEY_SIGN_FLAG_TLS1_RSA flag */
+int gnutls_privkey_sign_raw_data(gnutls_privkey_t key,
+				 unsigned flags,
+				 const gnutls_datum_t * data,
+				 gnutls_datum_t *
+				 signature) _GNUTLS_GCC_ATTR_DEPRECATED;
 
 #ifdef _ISOC99_SOURCE
 /* we provide older functions for compatibility as inline functions that
  * depend on gnutls_session_get_random. */
- 
-static inline const void *gnutls_session_get_server_random (gnutls_session_t session) _GNUTLS_GCC_ATTR_DEPRECATED;
-static inline const void *gnutls_session_get_server_random (gnutls_session_t session)
+
+static inline const void
+*gnutls_session_get_server_random(gnutls_session_t session)
+    _GNUTLS_GCC_ATTR_DEPRECATED;
+static inline const void
+*gnutls_session_get_server_random(gnutls_session_t session)
 {
-  gnutls_datum_t rnd;
-  gnutls_session_get_random(session, NULL, &rnd);/*doc-skip*/
-  return rnd.data;
+	gnutls_datum_t rnd;
+	gnutls_session_get_random(session, NULL, &rnd);	/*doc-skip */
+	return rnd.data;
 }
 
-static inline const void *gnutls_session_get_client_random (gnutls_session_t session) _GNUTLS_GCC_ATTR_DEPRECATED;
-static inline const void *gnutls_session_get_client_random (gnutls_session_t session)
+static inline const void
+*gnutls_session_get_client_random(gnutls_session_t session)
+    _GNUTLS_GCC_ATTR_DEPRECATED;
+static inline const void
+*gnutls_session_get_client_random(gnutls_session_t session)
 {
-  gnutls_datum_t rnd;
-  gnutls_session_get_random(session, &rnd, NULL);/*doc-skip*/
-  return rnd.data;
+	gnutls_datum_t rnd;
+	gnutls_session_get_random(session, &rnd, NULL);	/*doc-skip */
+	return rnd.data;
 }
 #endif
 
 
+/* *INDENT-OFF* */
 #ifdef __cplusplus
 }
 #endif
+/* *INDENT-ON* */
 
-#endif /* _GNUTLS_COMPAT_H */
+#endif				/* _GNUTLS_COMPAT_H */