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

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

@@ -29,10 +29,11 @@
 #include <gnutls/openpgp.h>
 #include <gnutls/tpm.h>
 
+/* *INDENT-OFF* */
 #ifdef __cplusplus
-extern "C"
-{
+extern "C" {
 #endif
+/* *INDENT-ON* */
 
 /* Public key operations */
 
@@ -47,183 +48,191 @@ extern "C"
  *
  * Enumeration of different certificate import flags.
  */
-  typedef enum gnutls_pubkey_flags
-  {
-    GNUTLS_PUBKEY_VERIFY_FLAG_TLS1_RSA = 1,
-    GNUTLS_PUBKEY_DISABLE_CALLBACKS = 1<<2,
-    GNUTLS_PUBKEY_GET_OPENPGP_FINGERPRINT = 1<<3,
-  } gnutls_pubkey_flags_t;
-
-struct gnutls_pubkey_st;
-typedef struct gnutls_pubkey_st *gnutls_pubkey_t;
-
-struct gnutls_privkey_st;
-typedef struct gnutls_privkey_st *gnutls_privkey_t;
+typedef enum gnutls_pubkey_flags {
+	GNUTLS_PUBKEY_VERIFY_FLAG_TLS1_RSA = 1,
+	GNUTLS_PUBKEY_DISABLE_CALLBACKS = 1 << 2,
+	GNUTLS_PUBKEY_GET_OPENPGP_FINGERPRINT = 1 << 3,
+} gnutls_pubkey_flags_t;
 
 typedef int (*gnutls_privkey_sign_func) (gnutls_privkey_t key,
-                                         void *userdata,
-                                         const gnutls_datum_t * raw_data,
-                                         gnutls_datum_t * signature);
+					 void *userdata,
+					 const gnutls_datum_t *
+					 raw_data,
+					 gnutls_datum_t * signature);
 typedef int (*gnutls_privkey_decrypt_func) (gnutls_privkey_t key,
-                                            void *userdata,
-                                            const gnutls_datum_t * ciphertext,
-                                            gnutls_datum_t * plaintext);
+					    void *userdata,
+					    const gnutls_datum_t *
+					    ciphertext,
+					    gnutls_datum_t * plaintext);
 
 typedef void (*gnutls_privkey_deinit_func) (gnutls_privkey_t key,
-                                           void *userdata);
-
-int gnutls_pubkey_init (gnutls_pubkey_t * key);
-void gnutls_pubkey_deinit (gnutls_pubkey_t key);
-
-void gnutls_pubkey_set_pin_function (gnutls_pubkey_t key,
-                                      gnutls_pin_callback_t fn, void *userdata);
-
-int gnutls_pubkey_get_pk_algorithm (gnutls_pubkey_t key, unsigned int *bits);
-
-int gnutls_pubkey_import_x509 (gnutls_pubkey_t key, gnutls_x509_crt_t crt,
-                               unsigned int flags);
-int gnutls_pubkey_import_x509_crq (gnutls_pubkey_t key, gnutls_x509_crq_t crq,
-                                   unsigned int flags);
-int gnutls_pubkey_import_pkcs11 (gnutls_pubkey_t key,
-                                 gnutls_pkcs11_obj_t obj, unsigned int flags);
-int gnutls_pubkey_import_openpgp (gnutls_pubkey_t key,
-                                  gnutls_openpgp_crt_t crt,
-                                  unsigned int flags);
-
-int gnutls_pubkey_import_openpgp_raw (gnutls_pubkey_t pkey,
-                                      const gnutls_datum_t * data,
-                                      gnutls_openpgp_crt_fmt_t format,
-                                      const gnutls_openpgp_keyid_t keyid,
-                                      unsigned int flags);
-int gnutls_pubkey_import_x509_raw (gnutls_pubkey_t pkey,
-                                    const gnutls_datum_t * data,
-                                    gnutls_x509_crt_fmt_t format,
-                                    unsigned int flags);
+					    void *userdata);
+
+int gnutls_pubkey_init(gnutls_pubkey_t * key);
+void gnutls_pubkey_deinit(gnutls_pubkey_t key);
+
+void gnutls_pubkey_set_pin_function(gnutls_pubkey_t key,
+				    gnutls_pin_callback_t fn,
+				    void *userdata);
+
+int gnutls_pubkey_get_pk_algorithm(gnutls_pubkey_t key,
+				   unsigned int *bits);
+
+int gnutls_pubkey_import_x509(gnutls_pubkey_t key,
+			      gnutls_x509_crt_t crt, unsigned int flags);
+int gnutls_pubkey_import_x509_crq(gnutls_pubkey_t key,
+				  gnutls_x509_crq_t crq,
+				  unsigned int flags);
+int gnutls_pubkey_import_pkcs11(gnutls_pubkey_t key,
+				gnutls_pkcs11_obj_t obj,
+				unsigned int flags);
+int gnutls_pubkey_import_openpgp(gnutls_pubkey_t key,
+				 gnutls_openpgp_crt_t crt,
+				 unsigned int flags);
+
+int gnutls_pubkey_import_openpgp_raw(gnutls_pubkey_t pkey,
+				     const gnutls_datum_t * data,
+				     gnutls_openpgp_crt_fmt_t
+				     format,
+				     const gnutls_openpgp_keyid_t
+				     keyid, unsigned int flags);
+int gnutls_pubkey_import_x509_raw(gnutls_pubkey_t pkey,
+				  const gnutls_datum_t * data,
+				  gnutls_x509_crt_fmt_t format,
+				  unsigned int flags);
 
 int
-gnutls_pubkey_import_privkey (gnutls_pubkey_t key, gnutls_privkey_t pkey,
-                              unsigned int usage, unsigned int flags);
+gnutls_pubkey_import_privkey(gnutls_pubkey_t key,
+			     gnutls_privkey_t pkey,
+			     unsigned int usage, unsigned int flags);
 
 int
-gnutls_pubkey_import_tpm_url (gnutls_pubkey_t pkey,
-                              const char* url,
-                              const char *srk_password,
-                              unsigned int flags);
+gnutls_pubkey_import_tpm_url(gnutls_pubkey_t pkey,
+			     const char *url,
+			     const char *srk_password, unsigned int flags);
 
 int
-gnutls_pubkey_import_url (gnutls_pubkey_t key, const char *url,
-                          unsigned int flags);
+gnutls_pubkey_import_url(gnutls_pubkey_t key, const char *url,
+			 unsigned int flags);
 
 int
-gnutls_pubkey_import_tpm_raw (gnutls_pubkey_t pkey,
-			       const gnutls_datum_t * fdata,
-			       gnutls_tpmkey_fmt_t format,
-			       const char *srk_password,
-			       unsigned int flags);
-
-int gnutls_pubkey_get_preferred_hash_algorithm (gnutls_pubkey_t key,
-                                                gnutls_digest_algorithm_t *
-                                                hash, unsigned int *mand);
-
-int gnutls_pubkey_get_pk_rsa_raw (gnutls_pubkey_t key,
-                                  gnutls_datum_t * m, gnutls_datum_t * e);
-int gnutls_pubkey_get_pk_dsa_raw (gnutls_pubkey_t key,
-                                  gnutls_datum_t * p, gnutls_datum_t * q,
-                                  gnutls_datum_t * g, gnutls_datum_t * y);
-int gnutls_pubkey_get_pk_ecc_raw (gnutls_pubkey_t key, gnutls_ecc_curve_t *curve,
-                              gnutls_datum_t * x, gnutls_datum_t * y);
-int gnutls_pubkey_get_pk_ecc_x962 (gnutls_pubkey_t key, gnutls_datum_t* parameters,
-                                   gnutls_datum_t * ecpoint);
-
-int gnutls_pubkey_export (gnutls_pubkey_t key,
-                          gnutls_x509_crt_fmt_t format,
-                          void *output_data, size_t * output_data_size);
-
-int gnutls_pubkey_export2 (gnutls_pubkey_t key,
-                           gnutls_x509_crt_fmt_t format,
-                           gnutls_datum_t * out);
-
-int gnutls_pubkey_get_key_id (gnutls_pubkey_t key, unsigned int flags,
-                              unsigned char *output_data,
-                              size_t * output_data_size);
+gnutls_pubkey_import_tpm_raw(gnutls_pubkey_t pkey,
+			     const gnutls_datum_t * fdata,
+			     gnutls_tpmkey_fmt_t format,
+			     const char *srk_password, unsigned int flags);
+
+int gnutls_pubkey_get_preferred_hash_algorithm(gnutls_pubkey_t key,
+					       gnutls_digest_algorithm_t
+					       * hash, unsigned int *mand);
+
+int gnutls_pubkey_get_pk_rsa_raw(gnutls_pubkey_t key,
+				 gnutls_datum_t * m, gnutls_datum_t * e);
+int gnutls_pubkey_get_pk_dsa_raw(gnutls_pubkey_t key,
+				 gnutls_datum_t * p,
+				 gnutls_datum_t * q,
+				 gnutls_datum_t * g, gnutls_datum_t * y);
+int gnutls_pubkey_get_pk_ecc_raw(gnutls_pubkey_t key,
+				 gnutls_ecc_curve_t * curve,
+				 gnutls_datum_t * x, gnutls_datum_t * y);
+int gnutls_pubkey_get_pk_ecc_x962(gnutls_pubkey_t key,
+				  gnutls_datum_t * parameters,
+				  gnutls_datum_t * ecpoint);
+
+int gnutls_pubkey_export(gnutls_pubkey_t key,
+			 gnutls_x509_crt_fmt_t format,
+			 void *output_data, size_t * output_data_size);
+
+int gnutls_pubkey_export2(gnutls_pubkey_t key,
+			  gnutls_x509_crt_fmt_t format,
+			  gnutls_datum_t * out);
+
+int gnutls_pubkey_get_key_id(gnutls_pubkey_t key,
+			     unsigned int flags,
+			     unsigned char *output_data,
+			     size_t * output_data_size);
 
 int
-gnutls_pubkey_get_openpgp_key_id (gnutls_pubkey_t key, unsigned int flags,
-                          unsigned char *output_data,
-                          size_t * output_data_size,
-                          unsigned int *subkey);
-
-int gnutls_pubkey_get_key_usage (gnutls_pubkey_t key, unsigned int *usage);
-int gnutls_pubkey_set_key_usage (gnutls_pubkey_t key, unsigned int usage);
-
-int gnutls_pubkey_import (gnutls_pubkey_t key,
-                          const gnutls_datum_t * data,
-                          gnutls_x509_crt_fmt_t format);
-
-
-int gnutls_pubkey_import_pkcs11_url (gnutls_pubkey_t key, const char *url,
-                                     unsigned int flags
-                                     /* GNUTLS_PKCS11_OBJ_FLAG_* */ );
-int gnutls_pubkey_import_dsa_raw (gnutls_pubkey_t key,
-                                  const gnutls_datum_t * p,
-                                  const gnutls_datum_t * q,
-                                  const gnutls_datum_t * g,
-                                  const gnutls_datum_t * y);
-int gnutls_pubkey_import_rsa_raw (gnutls_pubkey_t key,
-                                  const gnutls_datum_t * m,
-                                  const gnutls_datum_t * e);
+gnutls_pubkey_get_openpgp_key_id(gnutls_pubkey_t key,
+				 unsigned int flags,
+				 unsigned char *output_data,
+				 size_t * output_data_size,
+				 unsigned int *subkey);
+
+int gnutls_pubkey_get_key_usage(gnutls_pubkey_t key, unsigned int *usage);
+int gnutls_pubkey_set_key_usage(gnutls_pubkey_t key, unsigned int usage);
+
+int gnutls_pubkey_import(gnutls_pubkey_t key,
+			 const gnutls_datum_t * data,
+			 gnutls_x509_crt_fmt_t format);
+
+
+int gnutls_pubkey_import_pkcs11_url(gnutls_pubkey_t key,
+				    const char *url, unsigned int flags
+				    /* GNUTLS_PKCS11_OBJ_FLAG_* */
+    );
+int gnutls_pubkey_import_dsa_raw(gnutls_pubkey_t key,
+				 const gnutls_datum_t * p,
+				 const gnutls_datum_t * q,
+				 const gnutls_datum_t * g,
+				 const gnutls_datum_t * y);
+int gnutls_pubkey_import_rsa_raw(gnutls_pubkey_t key,
+				 const gnutls_datum_t * m,
+				 const gnutls_datum_t * e);
 
 int
-gnutls_pubkey_import_ecc_x962 (gnutls_pubkey_t key,
-                               const gnutls_datum_t * parameters,
-                               const gnutls_datum_t * ecpoint);
+gnutls_pubkey_import_ecc_x962(gnutls_pubkey_t key,
+			      const gnutls_datum_t * parameters,
+			      const gnutls_datum_t * ecpoint);
 
 int
-gnutls_pubkey_import_ecc_raw (gnutls_pubkey_t key,
-                              gnutls_ecc_curve_t curve,
-                              const gnutls_datum_t * x,
-                              const gnutls_datum_t * y);
+gnutls_pubkey_import_ecc_raw(gnutls_pubkey_t key,
+			     gnutls_ecc_curve_t curve,
+			     const gnutls_datum_t * x,
+			     const gnutls_datum_t * y);
 
 int
-gnutls_pubkey_encrypt_data (gnutls_pubkey_t key, unsigned int flags,
-                           const gnutls_datum_t * plaintext,
-                           gnutls_datum_t * ciphertext);
+gnutls_pubkey_encrypt_data(gnutls_pubkey_t key,
+			   unsigned int flags,
+			   const gnutls_datum_t * plaintext,
+			   gnutls_datum_t * ciphertext);
 
-int gnutls_x509_crt_set_pubkey (gnutls_x509_crt_t crt, gnutls_pubkey_t key);
+int gnutls_x509_crt_set_pubkey(gnutls_x509_crt_t crt, gnutls_pubkey_t key);
 
-int gnutls_x509_crq_set_pubkey (gnutls_x509_crq_t crq, gnutls_pubkey_t key);
+int gnutls_x509_crq_set_pubkey(gnutls_x509_crq_t crq, gnutls_pubkey_t key);
 
 int
-gnutls_pubkey_verify_hash2 (gnutls_pubkey_t key, 
-                            gnutls_sign_algorithm_t algo,
-                            unsigned int flags,
-                            const gnutls_datum_t * hash,
-                            const gnutls_datum_t * signature);
+gnutls_pubkey_verify_hash2(gnutls_pubkey_t key,
+			   gnutls_sign_algorithm_t algo,
+			   unsigned int flags,
+			   const gnutls_datum_t * hash,
+			   const gnutls_datum_t * signature);
 
 int
-gnutls_pubkey_get_verify_algorithm (gnutls_pubkey_t key,
-                                    const gnutls_datum_t * signature,
-                                    gnutls_digest_algorithm_t * hash);
+gnutls_pubkey_get_verify_algorithm(gnutls_pubkey_t key,
+				   const gnutls_datum_t *
+				   signature,
+				   gnutls_digest_algorithm_t * hash);
 
 int
-gnutls_pubkey_verify_data2 (gnutls_pubkey_t pubkey, 
-                           gnutls_sign_algorithm_t algo,
-                           unsigned int flags,
+gnutls_pubkey_verify_data2(gnutls_pubkey_t pubkey,
+			   gnutls_sign_algorithm_t algo,
+			   unsigned int flags,
 			   const gnutls_datum_t * data,
 			   const gnutls_datum_t * signature);
 
 /* Private key operations */
 
-int gnutls_privkey_init (gnutls_privkey_t * key);
-void gnutls_privkey_deinit (gnutls_privkey_t key);
+int gnutls_privkey_init(gnutls_privkey_t * key);
+void gnutls_privkey_deinit(gnutls_privkey_t key);
 
-void gnutls_privkey_set_pin_function (gnutls_privkey_t key,
-                                      gnutls_pin_callback_t fn, void *userdata);
+void gnutls_privkey_set_pin_function(gnutls_privkey_t key,
+				     gnutls_pin_callback_t fn,
+				     void *userdata);
 
-int gnutls_privkey_get_pk_algorithm (gnutls_privkey_t key,
-                                     unsigned int *bits);
-gnutls_privkey_type_t gnutls_privkey_get_type (gnutls_privkey_t key);
-int gnutls_privkey_status (gnutls_privkey_t key);
+int gnutls_privkey_get_pk_algorithm(gnutls_privkey_t key,
+				    unsigned int *bits);
+gnutls_privkey_type_t gnutls_privkey_get_type(gnutls_privkey_t key);
+int gnutls_privkey_status(gnutls_privkey_t key);
 
 /**
  * gnutls_privkey_flags:
@@ -236,107 +245,109 @@ int gnutls_privkey_status (gnutls_privkey_t key);
  *
  * Enumeration of different certificate import flags.
  */
-  typedef enum gnutls_privkey_flags
-  {
-    GNUTLS_PRIVKEY_IMPORT_AUTO_RELEASE = 1,
-    GNUTLS_PRIVKEY_IMPORT_COPY = 1<<1,
-    GNUTLS_PRIVKEY_DISABLE_CALLBACKS = 1<<2,
-    GNUTLS_PRIVKEY_SIGN_FLAG_TLS1_RSA = 1<<4,
-  } gnutls_privkey_flags_t;
-
-int gnutls_privkey_import_pkcs11 (gnutls_privkey_t pkey,
-                                  gnutls_pkcs11_privkey_t key,
-                                  unsigned int flags);
-int gnutls_privkey_import_x509 (gnutls_privkey_t pkey,
-                                gnutls_x509_privkey_t key,
-                                unsigned int flags);
-int gnutls_privkey_import_openpgp (gnutls_privkey_t pkey,
-                                   gnutls_openpgp_privkey_t key,
-                                   unsigned int flags);
-
-int gnutls_privkey_import_openpgp_raw (gnutls_privkey_t pkey,
-                                    const gnutls_datum_t * data,
-                                    gnutls_openpgp_crt_fmt_t format,
-                                    const gnutls_openpgp_keyid_t keyid,
-                                    const char* password);
-
-int gnutls_privkey_import_x509_raw (gnutls_privkey_t pkey,
-                                    const gnutls_datum_t * data,
-                                    gnutls_x509_crt_fmt_t format,
-                                    const char* password, unsigned int flags);
+typedef enum gnutls_privkey_flags {
+	GNUTLS_PRIVKEY_IMPORT_AUTO_RELEASE = 1,
+	GNUTLS_PRIVKEY_IMPORT_COPY = 1 << 1,
+	GNUTLS_PRIVKEY_DISABLE_CALLBACKS = 1 << 2,
+	GNUTLS_PRIVKEY_SIGN_FLAG_TLS1_RSA = 1 << 4,
+} gnutls_privkey_flags_t;
+
+int gnutls_privkey_import_pkcs11(gnutls_privkey_t pkey,
+				 gnutls_pkcs11_privkey_t key,
+				 unsigned int flags);
+int gnutls_privkey_import_x509(gnutls_privkey_t pkey,
+			       gnutls_x509_privkey_t key,
+			       unsigned int flags);
+int gnutls_privkey_import_openpgp(gnutls_privkey_t pkey,
+				  gnutls_openpgp_privkey_t key,
+				  unsigned int flags);
+
+int gnutls_privkey_import_openpgp_raw(gnutls_privkey_t pkey,
+				      const gnutls_datum_t * data,
+				      gnutls_openpgp_crt_fmt_t
+				      format,
+				      const gnutls_openpgp_keyid_t
+				      keyid, const char *password);
+
+int gnutls_privkey_import_x509_raw(gnutls_privkey_t pkey,
+				   const gnutls_datum_t * data,
+				   gnutls_x509_crt_fmt_t format,
+				   const char *password,
+				   unsigned int flags);
 
 int
-gnutls_privkey_import_tpm_raw (gnutls_privkey_t pkey,
-			       const gnutls_datum_t * fdata,
-			       gnutls_tpmkey_fmt_t format,
-			       const char *srk_password,
-			       const char *key_password, unsigned int flags);
+gnutls_privkey_import_tpm_raw(gnutls_privkey_t pkey,
+			      const gnutls_datum_t * fdata,
+			      gnutls_tpmkey_fmt_t format,
+			      const char *srk_password,
+			      const char *key_password,
+			      unsigned int flags);
 
 int
-gnutls_privkey_import_tpm_url (gnutls_privkey_t pkey,
-          const char* url, const char *srk_password, const char *key_password,
-          unsigned int flags);
+gnutls_privkey_import_tpm_url(gnutls_privkey_t pkey,
+			      const char *url,
+			      const char *srk_password,
+			      const char *key_password,
+			      unsigned int flags);
 
-int gnutls_privkey_import_url (gnutls_privkey_t key, const char *url, unsigned int flags);
+int gnutls_privkey_import_url(gnutls_privkey_t key,
+			      const char *url, unsigned int flags);
 
-int gnutls_privkey_import_pkcs11_url (gnutls_privkey_t key, const char *url);
+int gnutls_privkey_import_pkcs11_url(gnutls_privkey_t key,
+				     const char *url);
 
 int
-gnutls_privkey_import_ext (gnutls_privkey_t pkey,
-                           gnutls_pk_algorithm_t pk,
-                           void* userdata,
-                           gnutls_privkey_sign_func sign_func,
-                           gnutls_privkey_decrypt_func decrypt_func,
-                           unsigned int flags);
+gnutls_privkey_import_ext(gnutls_privkey_t pkey,
+			  gnutls_pk_algorithm_t pk,
+			  void *userdata,
+			  gnutls_privkey_sign_func sign_func,
+			  gnutls_privkey_decrypt_func
+			  decrypt_func, unsigned int flags);
 
 int
-gnutls_privkey_import_ext2 (gnutls_privkey_t pkey,
-                           gnutls_pk_algorithm_t pk,
-                           void* userdata,
-                           gnutls_privkey_sign_func sign_func,
-                           gnutls_privkey_decrypt_func decrypt_func,
-                           gnutls_privkey_deinit_func deinit_func,
-                           unsigned int flags);
-
-int gnutls_privkey_sign_data (gnutls_privkey_t signer,
-                              gnutls_digest_algorithm_t hash,
-                              unsigned int flags,
-                              const gnutls_datum_t * data,
-                              gnutls_datum_t * signature);
-
-int gnutls_privkey_sign_hash (gnutls_privkey_t signer,
-			      gnutls_digest_algorithm_t hash_algo,
-			      unsigned int flags,
-			      const gnutls_datum_t * hash_data,
-			      gnutls_datum_t * signature);
-
-int
-gnutls_privkey_sign_raw_data (gnutls_privkey_t key,
-			      unsigned flags,
-                              const gnutls_datum_t * data,
-                              gnutls_datum_t * signature);
-
-int gnutls_privkey_decrypt_data (gnutls_privkey_t key,
-                                 unsigned int flags,
-                                 const gnutls_datum_t * ciphertext,
-                                 gnutls_datum_t * plaintext);
-
-int gnutls_x509_crt_privkey_sign (gnutls_x509_crt_t crt,
-                                  gnutls_x509_crt_t issuer,
-                                  gnutls_privkey_t issuer_key,
-                                  gnutls_digest_algorithm_t dig,
-                                  unsigned int flags);
-
-int gnutls_x509_crl_privkey_sign (gnutls_x509_crl_t crl,
-                                  gnutls_x509_crt_t issuer,
-                                  gnutls_privkey_t issuer_key,
-                                  gnutls_digest_algorithm_t dig,
-                                  unsigned int flags);
-
-int gnutls_x509_crq_privkey_sign (gnutls_x509_crq_t crq,
-                                  gnutls_privkey_t key,
-                                  gnutls_digest_algorithm_t dig,
-                                  unsigned int flags);
+gnutls_privkey_import_ext2(gnutls_privkey_t pkey,
+			   gnutls_pk_algorithm_t pk,
+			   void *userdata,
+			   gnutls_privkey_sign_func sign_func,
+			   gnutls_privkey_decrypt_func
+			   decrypt_func,
+			   gnutls_privkey_deinit_func deinit_func,
+			   unsigned int flags);
+
+int gnutls_privkey_sign_data(gnutls_privkey_t signer,
+			     gnutls_digest_algorithm_t hash,
+			     unsigned int flags,
+			     const gnutls_datum_t * data,
+			     gnutls_datum_t * signature);
+
+int gnutls_privkey_sign_hash(gnutls_privkey_t signer,
+			     gnutls_digest_algorithm_t hash_algo,
+			     unsigned int flags,
+			     const gnutls_datum_t * hash_data,
+			     gnutls_datum_t * signature);
+
+
+int gnutls_privkey_decrypt_data(gnutls_privkey_t key,
+				unsigned int flags,
+				const gnutls_datum_t * ciphertext,
+				gnutls_datum_t * plaintext);
+
+int gnutls_x509_crt_privkey_sign(gnutls_x509_crt_t crt,
+				 gnutls_x509_crt_t issuer,
+				 gnutls_privkey_t issuer_key,
+				 gnutls_digest_algorithm_t dig,
+				 unsigned int flags);
+
+int gnutls_x509_crl_privkey_sign(gnutls_x509_crl_t crl,
+				 gnutls_x509_crt_t issuer,
+				 gnutls_privkey_t issuer_key,
+				 gnutls_digest_algorithm_t dig,
+				 unsigned int flags);
+
+int gnutls_x509_crq_privkey_sign(gnutls_x509_crq_t crq,
+				 gnutls_privkey_t key,
+				 gnutls_digest_algorithm_t dig,
+				 unsigned int flags);
 
 /**
  * gnutls_pcert_st:
@@ -346,88 +357,98 @@ int gnutls_x509_crq_privkey_sign (gnutls_x509_crq_t crq,
  *
  * A parsed certificate.
  */
-typedef struct gnutls_pcert_st
-{
-  gnutls_pubkey_t pubkey;
-  gnutls_datum_t cert;
-  gnutls_certificate_type_t type;
+typedef struct gnutls_pcert_st {
+	gnutls_pubkey_t pubkey;
+	gnutls_datum_t cert;
+	gnutls_certificate_type_t type;
 } gnutls_pcert_st;
 
 /* Do not initialize the "cert" element of
  * the certificate */
 #define GNUTLS_PCERT_NO_CERT 1
 
-int gnutls_pcert_import_x509 (gnutls_pcert_st* pcert,
-	gnutls_x509_crt_t crt, unsigned int flags);
+int gnutls_pcert_import_x509(gnutls_pcert_st * pcert,
+			     gnutls_x509_crt_t crt, unsigned int flags);
 
 int
-gnutls_pcert_list_import_x509_raw (gnutls_pcert_st * pcerts,
-                             unsigned int *pcert_max,
-                             const gnutls_datum_t * data,
-                             gnutls_x509_crt_fmt_t format, unsigned int flags);
-
-int gnutls_pcert_import_x509_raw (gnutls_pcert_st* pcert,
-	const gnutls_datum_t* cert, 
-	gnutls_x509_crt_fmt_t format, unsigned int flags);
-
-int gnutls_pcert_import_openpgp_raw (gnutls_pcert_st* pcert,
-	const gnutls_datum_t* cert, 
-	gnutls_openpgp_crt_fmt_t format, 
-	gnutls_openpgp_keyid_t keyid, unsigned int flags);
-
-int gnutls_pcert_import_openpgp (gnutls_pcert_st* pcert,
-	gnutls_openpgp_crt_t crt, unsigned int flags);
-
-void gnutls_pcert_deinit (gnutls_pcert_st* pcert);
+gnutls_pcert_list_import_x509_raw(gnutls_pcert_st * pcerts,
+				  unsigned int *pcert_max,
+				  const gnutls_datum_t * data,
+				  gnutls_x509_crt_fmt_t format,
+				  unsigned int flags);
+
+int gnutls_pcert_import_x509_raw(gnutls_pcert_st * pcert,
+				 const gnutls_datum_t * cert,
+				 gnutls_x509_crt_fmt_t format,
+				 unsigned int flags);
+
+int gnutls_pcert_import_openpgp_raw(gnutls_pcert_st * pcert,
+				    const gnutls_datum_t * cert,
+				    gnutls_openpgp_crt_fmt_t
+				    format,
+				    gnutls_openpgp_keyid_t keyid,
+				    unsigned int flags);
+
+int gnutls_pcert_import_openpgp(gnutls_pcert_st * pcert,
+				gnutls_openpgp_crt_t crt,
+				unsigned int flags);
+
+void gnutls_pcert_deinit(gnutls_pcert_st * pcert);
 
 /* For certificate credentials */
-  /* This is the same as gnutls_certificate_retrieve_function()
-   * but retrieves a gnutls_pcert_st which requires much less processing
-   * within the library.
-   */
-  typedef int gnutls_certificate_retrieve_function2 (gnutls_session_t,
-                                                    const gnutls_datum_t *
-                                                    req_ca_rdn,
-                                                    int nreqs,
-                                                    const
-                                                    gnutls_pk_algorithm_t
-                                                    * pk_algos,
-                                                    int pk_algos_length,
-                                                    gnutls_pcert_st **,
-                                                    unsigned int *pcert_length,
-                                                    gnutls_privkey_t *privkey);
-
-
-void gnutls_certificate_set_retrieve_function2 (
-   gnutls_certificate_credentials_t cred,
-   gnutls_certificate_retrieve_function2 * func);
+	/* This is the same as gnutls_certificate_retrieve_function()
+	 * but retrieves a gnutls_pcert_st which requires much less processing
+	 * within the library.
+	 */
+typedef int gnutls_certificate_retrieve_function2(gnutls_session_t,
+						  const
+						  gnutls_datum_t *
+						  req_ca_rdn,
+						  int nreqs, const
+						  gnutls_pk_algorithm_t
+						  * pk_algos,
+						  int
+						  pk_algos_length,
+						  gnutls_pcert_st
+						  **, unsigned int
+						  *pcert_length,
+						  gnutls_privkey_t
+						  * privkey);
+
+
+void gnutls_certificate_set_retrieve_function2
+    (gnutls_certificate_credentials_t cred,
+     gnutls_certificate_retrieve_function2 * func);
 
 int
-gnutls_certificate_set_key (gnutls_certificate_credentials_t res,
-                            const char** names,
-                            int names_size,
-                            gnutls_pcert_st * pcert_list,
-                            int pcert_list_size,
-                            gnutls_privkey_t key);
+gnutls_certificate_set_key(gnutls_certificate_credentials_t res,
+			   const char **names,
+			   int names_size,
+			   gnutls_pcert_st * pcert_list,
+			   int pcert_list_size, gnutls_privkey_t key);
 
 #include <gnutls/compat.h>
 
-int gnutls_pubkey_verify_data (gnutls_pubkey_t pubkey,
-                               unsigned int flags,
-                               const gnutls_datum_t * data,
-                               const gnutls_datum_t * signature) _GNUTLS_GCC_ATTR_DEPRECATED;
+int gnutls_pubkey_verify_data(gnutls_pubkey_t pubkey,
+			      unsigned int flags,
+			      const gnutls_datum_t * data,
+			      const gnutls_datum_t *
+			      signature) _GNUTLS_GCC_ATTR_DEPRECATED;
 
-int gnutls_pubkey_verify_hash (gnutls_pubkey_t key, unsigned int flags,
-                           const gnutls_datum_t * hash,
-                           const gnutls_datum_t * signature) _GNUTLS_GCC_ATTR_DEPRECATED;
+int gnutls_pubkey_verify_hash(gnutls_pubkey_t key,
+			      unsigned int flags,
+			      const gnutls_datum_t * hash,
+			      const gnutls_datum_t *
+			      signature) _GNUTLS_GCC_ATTR_DEPRECATED;
 
 int
-gnutls_pubkey_print (gnutls_pubkey_t pubkey,
-                     gnutls_certificate_print_formats_t format,
-                     gnutls_datum_t * out);
+gnutls_pubkey_print(gnutls_pubkey_t pubkey,
+		    gnutls_certificate_print_formats_t format,
+		    gnutls_datum_t * out);
 
+/* *INDENT-OFF* */
 #ifdef __cplusplus
 }
 #endif
-
+/* *INDENT-ON* */
 #endif