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

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

@@ -28,10 +28,11 @@
 #include <gnutls/gnutls.h>
 #include <gnutls/x509.h>
 
+/* *INDENT-OFF* */
 #ifdef __cplusplus
-extern "C"
-{
+extern "C" {
 #endif
+/* *INDENT-ON* */
 
 #define GNUTLS_PKCS11_MAX_PIN_LEN 32
 
@@ -53,46 +54,49 @@ extern "C"
  *
  * Since: 2.12.0
  **/
-typedef int (*gnutls_pkcs11_token_callback_t) (void *const userdata,
-                                               const char *const label,
-                                               unsigned retry);
+typedef int (*gnutls_pkcs11_token_callback_t) (void *const
+					       userdata,
+					       const char *const
+					       label, unsigned retry);
 
 
 struct gnutls_pkcs11_obj_st;
 typedef struct gnutls_pkcs11_obj_st *gnutls_pkcs11_obj_t;
 
 
-#define GNUTLS_PKCS11_FLAG_MANUAL 0     /* Manual loading of libraries */
-#define GNUTLS_PKCS11_FLAG_AUTO 1       /* Automatically load libraries by reading /etc/gnutls/pkcs11.conf */
+#define GNUTLS_PKCS11_FLAG_MANUAL 0	/* Manual loading of libraries */
+#define GNUTLS_PKCS11_FLAG_AUTO 1	/* Automatically load libraries by reading /etc/gnutls/pkcs11.conf */
 
 /* pkcs11.conf format:
  * load = /lib/xxx-pkcs11.so
  * load = /lib/yyy-pkcs11.so
  */
 
-int gnutls_pkcs11_init (unsigned int flags, const char *deprecated_config_file);
-int gnutls_pkcs11_reinit (void);
-void gnutls_pkcs11_deinit (void);
-void gnutls_pkcs11_set_token_function (gnutls_pkcs11_token_callback_t fn,
-                                       void *userdata);
+int gnutls_pkcs11_init(unsigned int flags,
+		       const char *deprecated_config_file);
+int gnutls_pkcs11_reinit(void);
+void gnutls_pkcs11_deinit(void);
+void gnutls_pkcs11_set_token_function
+    (gnutls_pkcs11_token_callback_t fn, void *userdata);
 
-void gnutls_pkcs11_set_pin_function (gnutls_pin_callback_t fn,
-                                     void *userdata);
+void gnutls_pkcs11_set_pin_function(gnutls_pin_callback_t fn,
+				    void *userdata);
 
-gnutls_pin_callback_t gnutls_pkcs11_get_pin_function (void **userdata);
+gnutls_pin_callback_t gnutls_pkcs11_get_pin_function(void
+						     **userdata);
 
-int gnutls_pkcs11_add_provider (const char *name, const char *params);
-int gnutls_pkcs11_obj_init (gnutls_pkcs11_obj_t * obj);
-void gnutls_pkcs11_obj_set_pin_function (gnutls_pkcs11_obj_t obj,
-					 gnutls_pin_callback_t fn,
-					 void *userdata);
+int gnutls_pkcs11_add_provider(const char *name, const char *params);
+int gnutls_pkcs11_obj_init(gnutls_pkcs11_obj_t * obj);
+void gnutls_pkcs11_obj_set_pin_function(gnutls_pkcs11_obj_t obj,
+					gnutls_pin_callback_t fn,
+					void *userdata);
 
-#define GNUTLS_PKCS11_OBJ_FLAG_LOGIN (1<<0)     /* force login in the token for the operation */
-#define GNUTLS_PKCS11_OBJ_FLAG_MARK_TRUSTED (1<<1)      /* object marked as trusted */
-#define GNUTLS_PKCS11_OBJ_FLAG_MARK_SENSITIVE (1<<2)    /* object marked as sensitive (unexportable) */
-#define GNUTLS_PKCS11_OBJ_FLAG_LOGIN_SO (1<<3)     /* force login as a security officer in the token for the operation */
-#define GNUTLS_PKCS11_OBJ_FLAG_MARK_PRIVATE (1<<4) /* marked as private (requires PIN to access) */
-#define GNUTLS_PKCS11_OBJ_FLAG_MARK_NOT_PRIVATE (1<<5) /* marked as not private */
+#define GNUTLS_PKCS11_OBJ_FLAG_LOGIN (1<<0)	/* force login in the token for the operation */
+#define GNUTLS_PKCS11_OBJ_FLAG_MARK_TRUSTED (1<<1)	/* object marked as trusted */
+#define GNUTLS_PKCS11_OBJ_FLAG_MARK_SENSITIVE (1<<2)	/* object marked as sensitive (unexportable) */
+#define GNUTLS_PKCS11_OBJ_FLAG_LOGIN_SO (1<<3)	/* force login as a security officer in the token for the operation */
+#define GNUTLS_PKCS11_OBJ_FLAG_MARK_PRIVATE (1<<4)	/* marked as private (requires PIN to access) */
+#define GNUTLS_PKCS11_OBJ_FLAG_MARK_NOT_PRIVATE (1<<5)	/* marked as not private */
 
 /**
  * gnutls_pkcs11_url_type_t:
@@ -102,41 +106,54 @@ void gnutls_pkcs11_obj_set_pin_function (gnutls_pkcs11_obj_t obj,
  *
  * Enumeration of different URL extraction flags.
  */
-typedef enum
-  {
-    GNUTLS_PKCS11_URL_GENERIC,    /* URL specifies the object on token level */
-    GNUTLS_PKCS11_URL_LIB,        /* URL specifies the object on module level */
-    GNUTLS_PKCS11_URL_LIB_VERSION /* URL specifies the object on module and version level */
-  } gnutls_pkcs11_url_type_t;
-
-int gnutls_pkcs11_obj_import_url (gnutls_pkcs11_obj_t obj,
-				  const char *url,
+typedef enum {
+	GNUTLS_PKCS11_URL_GENERIC,	/* URL specifies the object on token level */
+	GNUTLS_PKCS11_URL_LIB,	/* URL specifies the object on module level */
+	GNUTLS_PKCS11_URL_LIB_VERSION	/* URL specifies the object on module and version level */
+} gnutls_pkcs11_url_type_t;
+
+int gnutls_pkcs11_obj_import_url(gnutls_pkcs11_obj_t obj,
+				 const char *url, unsigned int flags
+				 /* GNUTLS_PKCS11_OBJ_FLAG_* */ );
+int gnutls_pkcs11_obj_export_url(gnutls_pkcs11_obj_t obj,
+				 gnutls_pkcs11_url_type_t detailed,
+				 char **url);
+void gnutls_pkcs11_obj_deinit(gnutls_pkcs11_obj_t obj);
+
+int gnutls_pkcs11_obj_export(gnutls_pkcs11_obj_t obj,
+			     void *output_data, size_t * output_data_size);
+int gnutls_pkcs11_obj_export2(gnutls_pkcs11_obj_t obj,
+			      gnutls_datum_t * out);
+
+int gnutls_pkcs11_obj_export3(gnutls_pkcs11_obj_t obj, gnutls_x509_crt_fmt_t fmt,
+			      gnutls_datum_t * out);
+
+int gnutls_pkcs11_get_raw_issuer(const char *url, gnutls_x509_crt_t cert,
+			     gnutls_datum_t * issuer,
+			     gnutls_x509_crt_fmt_t fmt,
+			     unsigned int flags);
+
+int gnutls_pkcs11_copy_x509_crt(const char *token_url,
+				gnutls_x509_crt_t crt,
+				const char *label, unsigned int flags
+				/* GNUTLS_PKCS11_OBJ_FLAG_* */ );
+int gnutls_pkcs11_copy_x509_privkey(const char *token_url,
+				    gnutls_x509_privkey_t key,
+				    const char *label,
+				    unsigned int key_usage
+				    /*GNUTLS_KEY_* */ ,
+				    unsigned int flags
+				    /* GNUTLS_PKCS11_OBJ_FLAG_* */
+    );
+int gnutls_pkcs11_delete_url(const char *object_url, unsigned int flags
+			     /* GNUTLS_PKCS11_OBJ_FLAG_* */ );
+
+int gnutls_pkcs11_copy_secret_key(const char *token_url,
+				  gnutls_datum_t * key,
+				  const char *label, unsigned int key_usage
+				  /* GNUTLS_KEY_* */ ,
 				  unsigned int flags
 				  /* GNUTLS_PKCS11_OBJ_FLAG_* */ );
-int gnutls_pkcs11_obj_export_url (gnutls_pkcs11_obj_t obj,
-                                  gnutls_pkcs11_url_type_t detailed,
-                                  char **url);
-void gnutls_pkcs11_obj_deinit (gnutls_pkcs11_obj_t obj);
-
-int gnutls_pkcs11_obj_export (gnutls_pkcs11_obj_t obj,
-                              void *output_data, size_t * output_data_size);
-int gnutls_pkcs11_obj_export2 (gnutls_pkcs11_obj_t obj,
-                               gnutls_datum_t *out);
-
-int gnutls_pkcs11_copy_x509_crt (const char *token_url, gnutls_x509_crt_t crt,
-                                 const char *label, unsigned int flags
-                                 /* GNUTLS_PKCS11_OBJ_FLAG_* */ );
-int gnutls_pkcs11_copy_x509_privkey (const char *token_url, gnutls_x509_privkey_t key, 
-  const char *label, unsigned int key_usage /*GNUTLS_KEY_* */, unsigned int flags
-                                     /* GNUTLS_PKCS11_OBJ_FLAG_* */ );
-int gnutls_pkcs11_delete_url (const char *object_url, unsigned int flags
-                              /* GNUTLS_PKCS11_OBJ_FLAG_* */ );
-
-int gnutls_pkcs11_copy_secret_key (const char *token_url,
-                                   gnutls_datum_t * key, const char *label,
-                                   unsigned int key_usage /* GNUTLS_KEY_* */ ,
-                                   unsigned int flags
-                                   /* GNUTLS_PKCS11_OBJ_FLAG_* */ );
 
 /**
  * gnutls_pkcs11_obj_info_t:
@@ -153,24 +170,23 @@ int gnutls_pkcs11_copy_secret_key (const char *token_url,
  *
  * Enumeration of several object information types.
  */
-typedef enum
-  {
-    GNUTLS_PKCS11_OBJ_ID_HEX = 1,
-    GNUTLS_PKCS11_OBJ_LABEL,
-    GNUTLS_PKCS11_OBJ_TOKEN_LABEL,
-    GNUTLS_PKCS11_OBJ_TOKEN_SERIAL,
-    GNUTLS_PKCS11_OBJ_TOKEN_MANUFACTURER,
-    GNUTLS_PKCS11_OBJ_TOKEN_MODEL,
-    GNUTLS_PKCS11_OBJ_ID,
-    /* the pkcs11 provider library info  */
-    GNUTLS_PKCS11_OBJ_LIBRARY_VERSION,
-    GNUTLS_PKCS11_OBJ_LIBRARY_DESCRIPTION,
-    GNUTLS_PKCS11_OBJ_LIBRARY_MANUFACTURER
-  } gnutls_pkcs11_obj_info_t;
-
-int gnutls_pkcs11_obj_get_info (gnutls_pkcs11_obj_t crt,
-                                gnutls_pkcs11_obj_info_t itype, void *output,
-                                size_t * output_size);
+typedef enum {
+	GNUTLS_PKCS11_OBJ_ID_HEX = 1,
+	GNUTLS_PKCS11_OBJ_LABEL,
+	GNUTLS_PKCS11_OBJ_TOKEN_LABEL,
+	GNUTLS_PKCS11_OBJ_TOKEN_SERIAL,
+	GNUTLS_PKCS11_OBJ_TOKEN_MANUFACTURER,
+	GNUTLS_PKCS11_OBJ_TOKEN_MODEL,
+	GNUTLS_PKCS11_OBJ_ID,
+	/* the pkcs11 provider library info  */
+	GNUTLS_PKCS11_OBJ_LIBRARY_VERSION,
+	GNUTLS_PKCS11_OBJ_LIBRARY_DESCRIPTION,
+	GNUTLS_PKCS11_OBJ_LIBRARY_MANUFACTURER
+} gnutls_pkcs11_obj_info_t;
+
+int gnutls_pkcs11_obj_get_info(gnutls_pkcs11_obj_t crt,
+			       gnutls_pkcs11_obj_info_t itype,
+			       void *output, size_t * output_size);
 
 /**
  * gnutls_pkcs11_obj_attr_t:
@@ -184,16 +200,15 @@ int gnutls_pkcs11_obj_get_info (gnutls_pkcs11_obj_t crt,
  *
  * Enumeration of several attributes for object enumeration.
  */
-typedef enum
-  {
-    GNUTLS_PKCS11_OBJ_ATTR_CRT_ALL = 1,   /* all certificates */
-    GNUTLS_PKCS11_OBJ_ATTR_CRT_TRUSTED,   /* certificates marked as trusted */
-    GNUTLS_PKCS11_OBJ_ATTR_CRT_WITH_PRIVKEY,      /* certificates with corresponding private key */
-    GNUTLS_PKCS11_OBJ_ATTR_PUBKEY,        /* public keys */
-    GNUTLS_PKCS11_OBJ_ATTR_PRIVKEY,       /* private keys */
-    GNUTLS_PKCS11_OBJ_ATTR_ALL,    /* everything! */
-    GNUTLS_PKCS11_OBJ_ATTR_CRT_TRUSTED_CA,       /* CAs */
-  } gnutls_pkcs11_obj_attr_t;
+typedef enum {
+	GNUTLS_PKCS11_OBJ_ATTR_CRT_ALL = 1,	/* all certificates */
+	GNUTLS_PKCS11_OBJ_ATTR_CRT_TRUSTED,	/* certificates marked as trusted */
+	GNUTLS_PKCS11_OBJ_ATTR_CRT_WITH_PRIVKEY,	/* certificates with corresponding private key */
+	GNUTLS_PKCS11_OBJ_ATTR_PUBKEY,	/* public keys */
+	GNUTLS_PKCS11_OBJ_ATTR_PRIVKEY,	/* private keys */
+	GNUTLS_PKCS11_OBJ_ATTR_ALL,	/* everything! */
+	GNUTLS_PKCS11_OBJ_ATTR_CRT_TRUSTED_CA,	/* CAs */
+} gnutls_pkcs11_obj_attr_t;
 
 /**
  * gnutls_pkcs11_token_info_t:
@@ -204,13 +219,12 @@ typedef enum
  *
  * Enumeration of types for retrieving token information.
  */
-typedef enum
-  {
-    GNUTLS_PKCS11_TOKEN_LABEL,
-    GNUTLS_PKCS11_TOKEN_SERIAL,
-    GNUTLS_PKCS11_TOKEN_MANUFACTURER,
-    GNUTLS_PKCS11_TOKEN_MODEL
-  } gnutls_pkcs11_token_info_t;
+typedef enum {
+	GNUTLS_PKCS11_TOKEN_LABEL,
+	GNUTLS_PKCS11_TOKEN_SERIAL,
+	GNUTLS_PKCS11_TOKEN_MANUFACTURER,
+	GNUTLS_PKCS11_TOKEN_MODEL
+} gnutls_pkcs11_token_info_t;
 
 /**
  * gnutls_pkcs11_obj_type_t:
@@ -223,103 +237,112 @@ typedef enum
  *
  * Enumeration of object types.
  */
-typedef enum
-  {
-    GNUTLS_PKCS11_OBJ_UNKNOWN,
-    GNUTLS_PKCS11_OBJ_X509_CRT,
-    GNUTLS_PKCS11_OBJ_PUBKEY,
-    GNUTLS_PKCS11_OBJ_PRIVKEY,
-    GNUTLS_PKCS11_OBJ_SECRET_KEY,
-    GNUTLS_PKCS11_OBJ_DATA
-  } gnutls_pkcs11_obj_type_t;
+typedef enum {
+	GNUTLS_PKCS11_OBJ_UNKNOWN,
+	GNUTLS_PKCS11_OBJ_X509_CRT,
+	GNUTLS_PKCS11_OBJ_PUBKEY,
+	GNUTLS_PKCS11_OBJ_PRIVKEY,
+	GNUTLS_PKCS11_OBJ_SECRET_KEY,
+	GNUTLS_PKCS11_OBJ_DATA
+} gnutls_pkcs11_obj_type_t;
 
 int
-gnutls_pkcs11_token_init (const char *token_url,
-                          const char *so_pin, const char *label);
+gnutls_pkcs11_token_init(const char *token_url,
+			 const char *so_pin, const char *label);
 
 int
-gnutls_pkcs11_token_get_mechanism (const char *url, unsigned int idx,
-                                   unsigned long *mechanism);
-
-int gnutls_pkcs11_token_set_pin (const char *token_url,
-				 const char *oldpin,
-				 const char *newpin,
-				 unsigned int flags  /*gnutls_pin_flag_t */
-				 );
-
-int gnutls_pkcs11_token_get_url (unsigned int seq,
-                                 gnutls_pkcs11_url_type_t detailed,
-                                 char **url);
-int gnutls_pkcs11_token_get_info (const char *url,
-				  gnutls_pkcs11_token_info_t ttype,
-                                  void *output, size_t * output_size);
+gnutls_pkcs11_token_get_mechanism(const char *url,
+				  unsigned int idx,
+				  unsigned long *mechanism);
+
+int gnutls_pkcs11_token_set_pin(const char *token_url, const char *oldpin, const char *newpin, unsigned int flags	/*gnutls_pin_flag_t */);
+
+int gnutls_pkcs11_token_get_url(unsigned int seq,
+				gnutls_pkcs11_url_type_t detailed,
+				char **url);
+int gnutls_pkcs11_token_get_info(const char *url,
+				 gnutls_pkcs11_token_info_t ttype,
+				 void *output, size_t * output_size);
 
 #define GNUTLS_PKCS11_TOKEN_HW 1
-int gnutls_pkcs11_token_get_flags (const char *url, unsigned int *flags);
+int gnutls_pkcs11_token_get_flags(const char *url, unsigned int *flags);
 
-int gnutls_pkcs11_obj_list_import_url (gnutls_pkcs11_obj_t * p_list,
-                                       unsigned int *const n_list,
-                                       const char *url,
-                                       gnutls_pkcs11_obj_attr_t attrs,
-                                       unsigned int flags
-                                       /* GNUTLS_PKCS11_OBJ_FLAG_* */ );
+int gnutls_pkcs11_obj_list_import_url(gnutls_pkcs11_obj_t * p_list,
+				      unsigned int *const n_list,
+				      const char *url,
+				      gnutls_pkcs11_obj_attr_t
+				      attrs, unsigned int flags
+				      /* GNUTLS_PKCS11_OBJ_FLAG_* */
+    );
 
 int
-gnutls_pkcs11_obj_list_import_url2 (gnutls_pkcs11_obj_t ** p_list,
-                                   unsigned int *n_list,
-                                   const char *url,
-                                   gnutls_pkcs11_obj_attr_t attrs,
-                                   unsigned int flags
-                                   /* GNUTLS_PKCS11_OBJ_FLAG_* */ );
-
-int gnutls_x509_crt_import_pkcs11 (gnutls_x509_crt_t crt,
-                                   gnutls_pkcs11_obj_t pkcs11_crt);
-int gnutls_x509_crt_import_pkcs11_url (gnutls_x509_crt_t crt, const char *url,
-                                       unsigned int flags
-                                       /* GNUTLS_PKCS11_OBJ_FLAG_* */ );
-
-gnutls_pkcs11_obj_type_t gnutls_pkcs11_obj_get_type (gnutls_pkcs11_obj_t obj);
-const char *gnutls_pkcs11_type_get_name (gnutls_pkcs11_obj_type_t type);
-
-int gnutls_x509_crt_list_import_pkcs11 (gnutls_x509_crt_t * certs,
-					unsigned int cert_max,
-					gnutls_pkcs11_obj_t * const objs,
-					unsigned int flags  /* must be zero */);
+gnutls_pkcs11_obj_list_import_url2(gnutls_pkcs11_obj_t ** p_list,
+				   unsigned int *n_list,
+				   const char *url,
+				   gnutls_pkcs11_obj_attr_t attrs,
+				   unsigned int flags
+				   /* GNUTLS_PKCS11_OBJ_FLAG_* */
+    );
+
+int gnutls_x509_crt_import_pkcs11(gnutls_x509_crt_t crt,
+				  gnutls_pkcs11_obj_t pkcs11_crt);
+int gnutls_x509_crt_import_pkcs11_url(gnutls_x509_crt_t crt,
+				      const char *url, unsigned int flags
+				      /* GNUTLS_PKCS11_OBJ_FLAG_* */
+    );
+
+gnutls_pkcs11_obj_type_t
+gnutls_pkcs11_obj_get_type(gnutls_pkcs11_obj_t obj);
+const char *gnutls_pkcs11_type_get_name(gnutls_pkcs11_obj_type_t type);
+
+int gnutls_x509_crt_list_import_pkcs11(gnutls_x509_crt_t * certs,
+				       unsigned int cert_max,
+				       gnutls_pkcs11_obj_t *
+				       const objs, unsigned int flags
+				       /* must be zero */ );
 
 /* private key functions...*/
-int gnutls_pkcs11_privkey_init (gnutls_pkcs11_privkey_t * key);
-void gnutls_pkcs11_privkey_set_pin_function (gnutls_pkcs11_privkey_t key,
-					     gnutls_pin_callback_t fn,
-					     void *userdata);
-void gnutls_pkcs11_privkey_deinit (gnutls_pkcs11_privkey_t key);
-int gnutls_pkcs11_privkey_get_pk_algorithm (gnutls_pkcs11_privkey_t key,
-					    unsigned int *bits);
-int gnutls_pkcs11_privkey_get_info (gnutls_pkcs11_privkey_t pkey,
-				    gnutls_pkcs11_obj_info_t itype,
-				    void *output, size_t * output_size);
-
-int gnutls_pkcs11_privkey_import_url (gnutls_pkcs11_privkey_t pkey,
-				      const char *url, unsigned int flags);
-
-int gnutls_pkcs11_privkey_export_url (gnutls_pkcs11_privkey_t key,
-				      gnutls_pkcs11_url_type_t detailed,
-				      char **url);
-int gnutls_pkcs11_privkey_status (gnutls_pkcs11_privkey_t key);
-
-int gnutls_pkcs11_privkey_generate (const char* url,
-				    gnutls_pk_algorithm_t pk,
-				    unsigned int bits,
-				    const char* label, unsigned int flags);
+int gnutls_pkcs11_privkey_init(gnutls_pkcs11_privkey_t * key);
+void gnutls_pkcs11_privkey_set_pin_function(gnutls_pkcs11_privkey_t
+					    key,
+					    gnutls_pin_callback_t
+					    fn, void *userdata);
+void gnutls_pkcs11_privkey_deinit(gnutls_pkcs11_privkey_t key);
+int gnutls_pkcs11_privkey_get_pk_algorithm(gnutls_pkcs11_privkey_t
+					   key, unsigned int *bits);
+int gnutls_pkcs11_privkey_get_info(gnutls_pkcs11_privkey_t pkey,
+				   gnutls_pkcs11_obj_info_t itype,
+				   void *output, size_t * output_size);
+
+int gnutls_pkcs11_privkey_import_url(gnutls_pkcs11_privkey_t pkey,
+				     const char *url, unsigned int flags);
+
+int gnutls_pkcs11_privkey_export_url(gnutls_pkcs11_privkey_t key,
+				     gnutls_pkcs11_url_type_t
+				     detailed, char **url);
+int gnutls_pkcs11_privkey_status(gnutls_pkcs11_privkey_t key);
+
+int gnutls_pkcs11_privkey_generate(const char *url,
+				   gnutls_pk_algorithm_t pk,
+				   unsigned int bits,
+				   const char *label, unsigned int flags);
 
 int
-gnutls_pkcs11_privkey_generate2 (const char* url, gnutls_pk_algorithm_t pk, 
-                                unsigned int bits, const char* label, 
-                                gnutls_x509_crt_fmt_t fmt, 
-                                gnutls_datum_t * pubkey,
-                                unsigned int flags);
+gnutls_pkcs11_privkey_generate2(const char *url,
+				gnutls_pk_algorithm_t pk,
+				unsigned int bits,
+				const char *label,
+				gnutls_x509_crt_fmt_t fmt,
+				gnutls_datum_t * pubkey,
+				unsigned int flags);
 
+int
+gnutls_pkcs11_token_get_random(const char *token_url,
+			       void *data, size_t len);
+
+/* *INDENT-OFF* */
 #ifdef __cplusplus
 }
 #endif
-
+/* *INDENT-ON* */
 #endif

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

@@ -25,52 +25,53 @@
 
 #include <gnutls/x509.h>
 
+/* *INDENT-OFF* */
 #ifdef __cplusplus
-extern "C"
-{
+extern "C" {
 #endif
-
-  /* PKCS12 structures handling
-   */
-  struct gnutls_pkcs12_int;
-  typedef struct gnutls_pkcs12_int *gnutls_pkcs12_t;
-
-  struct gnutls_pkcs12_bag_int;
-  typedef struct gnutls_pkcs12_bag_int *gnutls_pkcs12_bag_t;
-
-  int gnutls_pkcs12_init (gnutls_pkcs12_t * pkcs12);
-  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_t format, unsigned int flags);
-  int gnutls_pkcs12_export (gnutls_pkcs12_t pkcs12,
-                            gnutls_x509_crt_fmt_t format,
-                            void *output_data, size_t * output_data_size);
-  int gnutls_pkcs12_export2 (gnutls_pkcs12_t pkcs12,
-                             gnutls_x509_crt_fmt_t format,
-                             gnutls_datum_t *out);
-
-  int gnutls_pkcs12_get_bag (gnutls_pkcs12_t pkcs12,
-                             int indx, gnutls_pkcs12_bag_t bag);
-  int gnutls_pkcs12_set_bag (gnutls_pkcs12_t pkcs12, gnutls_pkcs12_bag_t bag);
-
-  int gnutls_pkcs12_generate_mac (gnutls_pkcs12_t pkcs12, const char *pass);
-  int gnutls_pkcs12_verify_mac (gnutls_pkcs12_t pkcs12, const char *pass);
-
-  int gnutls_pkcs12_bag_decrypt (gnutls_pkcs12_bag_t bag, const char *pass);
-  int gnutls_pkcs12_bag_encrypt (gnutls_pkcs12_bag_t bag, const char *pass,
-                                 unsigned int flags);
+/* *INDENT-ON* */
+
+	/* PKCS12 structures handling
+	 */
+struct gnutls_pkcs12_int;
+typedef struct gnutls_pkcs12_int *gnutls_pkcs12_t;
+
+struct gnutls_pkcs12_bag_int;
+typedef struct gnutls_pkcs12_bag_int *gnutls_pkcs12_bag_t;
+
+int gnutls_pkcs12_init(gnutls_pkcs12_t * pkcs12);
+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_t format, unsigned int flags);
+int gnutls_pkcs12_export(gnutls_pkcs12_t pkcs12,
+			 gnutls_x509_crt_fmt_t format,
+			 void *output_data, size_t * output_data_size);
+int gnutls_pkcs12_export2(gnutls_pkcs12_t pkcs12,
+			  gnutls_x509_crt_fmt_t format,
+			  gnutls_datum_t * out);
+
+int gnutls_pkcs12_get_bag(gnutls_pkcs12_t pkcs12,
+			  int indx, gnutls_pkcs12_bag_t bag);
+int gnutls_pkcs12_set_bag(gnutls_pkcs12_t pkcs12, gnutls_pkcs12_bag_t bag);
+
+int gnutls_pkcs12_generate_mac(gnutls_pkcs12_t pkcs12, const char *pass);
+int gnutls_pkcs12_verify_mac(gnutls_pkcs12_t pkcs12, const char *pass);
+
+int gnutls_pkcs12_bag_decrypt(gnutls_pkcs12_bag_t bag, const char *pass);
+int gnutls_pkcs12_bag_encrypt(gnutls_pkcs12_bag_t bag,
+			      const char *pass, unsigned int flags);
 
 #define GNUTLS_PKCS12_SP_INCLUDE_SELF_SIGNED 1
-  int gnutls_pkcs12_simple_parse (gnutls_pkcs12_t p12,
-                     const char *password,
-                     gnutls_x509_privkey_t * key,
-                     gnutls_x509_crt_t ** chain,
-                     unsigned int * chain_len,
-                     gnutls_x509_crt_t ** extra_certs,
-                     unsigned int * extra_certs_len,
-                     gnutls_x509_crl_t * crl,
-                     unsigned int flags);
+int gnutls_pkcs12_simple_parse(gnutls_pkcs12_t p12,
+			       const char *password,
+			       gnutls_x509_privkey_t * key,
+			       gnutls_x509_crt_t ** chain,
+			       unsigned int *chain_len,
+			       gnutls_x509_crt_t ** extra_certs,
+			       unsigned int *extra_certs_len,
+			       gnutls_x509_crl_t * crl,
+			       unsigned int flags);
 
 /**
  * gnutls_pkcs12_bag_type_t:
@@ -85,50 +86,50 @@ extern "C"
  *
  * Enumeration of different PKCS 12 bag types.
  */
-  typedef enum gnutls_pkcs12_bag_type_t
-  {
-    GNUTLS_BAG_EMPTY = 0,
-    GNUTLS_BAG_PKCS8_ENCRYPTED_KEY = 1,
-    GNUTLS_BAG_PKCS8_KEY = 2,
-    GNUTLS_BAG_CERTIFICATE = 3,
-    GNUTLS_BAG_CRL = 4,
-    GNUTLS_BAG_SECRET = 5,      /* Secret data. Underspecified in pkcs-12,
-                                 * gnutls extension. We use the PKCS-9
-                                 * random nonce ID 1.2.840.113549.1.9.25.3
-                                 * to store randomly generated keys.
-                                 */
-    GNUTLS_BAG_ENCRYPTED = 10,
-    GNUTLS_BAG_UNKNOWN = 20
-  } gnutls_pkcs12_bag_type_t;
-
-    gnutls_pkcs12_bag_type_t
-    gnutls_pkcs12_bag_get_type (gnutls_pkcs12_bag_t bag, int indx);
-  int gnutls_pkcs12_bag_get_data (gnutls_pkcs12_bag_t bag, int indx,
-                                  gnutls_datum_t * data);
-  int gnutls_pkcs12_bag_set_data (gnutls_pkcs12_bag_t bag,
-                                  gnutls_pkcs12_bag_type_t type,
-                                  const gnutls_datum_t * data);
-  int gnutls_pkcs12_bag_set_crl (gnutls_pkcs12_bag_t bag,
-                                 gnutls_x509_crl_t crl);
-  int gnutls_pkcs12_bag_set_crt (gnutls_pkcs12_bag_t bag,
-                                 gnutls_x509_crt_t crt);
-
-  int gnutls_pkcs12_bag_init (gnutls_pkcs12_bag_t * bag);
-  void gnutls_pkcs12_bag_deinit (gnutls_pkcs12_bag_t bag);
-  int gnutls_pkcs12_bag_get_count (gnutls_pkcs12_bag_t bag);
-
-  int gnutls_pkcs12_bag_get_key_id (gnutls_pkcs12_bag_t bag, int indx,
-                                    gnutls_datum_t * id);
-  int gnutls_pkcs12_bag_set_key_id (gnutls_pkcs12_bag_t bag, int indx,
-                                    const gnutls_datum_t * id);
-
-  int gnutls_pkcs12_bag_get_friendly_name (gnutls_pkcs12_bag_t bag, int indx,
-                                           char **name);
-  int gnutls_pkcs12_bag_set_friendly_name (gnutls_pkcs12_bag_t bag, int indx,
-                                           const char *name);
-
+typedef enum gnutls_pkcs12_bag_type_t {
+	GNUTLS_BAG_EMPTY = 0,
+	GNUTLS_BAG_PKCS8_ENCRYPTED_KEY = 1,
+	GNUTLS_BAG_PKCS8_KEY = 2,
+	GNUTLS_BAG_CERTIFICATE = 3,
+	GNUTLS_BAG_CRL = 4,
+	GNUTLS_BAG_SECRET = 5,	/* Secret data. Underspecified in pkcs-12,
+				 * gnutls extension. We use the PKCS-9
+				 * random nonce ID 1.2.840.113549.1.9.25.3
+				 * to store randomly generated keys.
+				 */
+	GNUTLS_BAG_ENCRYPTED = 10,
+	GNUTLS_BAG_UNKNOWN = 20
+} gnutls_pkcs12_bag_type_t;
+
+gnutls_pkcs12_bag_type_t
+gnutls_pkcs12_bag_get_type(gnutls_pkcs12_bag_t bag, int indx);
+int gnutls_pkcs12_bag_get_data(gnutls_pkcs12_bag_t bag, int indx,
+			       gnutls_datum_t * data);
+int gnutls_pkcs12_bag_set_data(gnutls_pkcs12_bag_t bag,
+			       gnutls_pkcs12_bag_type_t type,
+			       const gnutls_datum_t * data);
+int gnutls_pkcs12_bag_set_crl(gnutls_pkcs12_bag_t bag,
+			      gnutls_x509_crl_t crl);
+int gnutls_pkcs12_bag_set_crt(gnutls_pkcs12_bag_t bag,
+			      gnutls_x509_crt_t crt);
+
+int gnutls_pkcs12_bag_init(gnutls_pkcs12_bag_t * bag);
+void gnutls_pkcs12_bag_deinit(gnutls_pkcs12_bag_t bag);
+int gnutls_pkcs12_bag_get_count(gnutls_pkcs12_bag_t bag);
+
+int gnutls_pkcs12_bag_get_key_id(gnutls_pkcs12_bag_t bag, int indx,
+				 gnutls_datum_t * id);
+int gnutls_pkcs12_bag_set_key_id(gnutls_pkcs12_bag_t bag, int indx,
+				 const gnutls_datum_t * id);
+
+int gnutls_pkcs12_bag_get_friendly_name(gnutls_pkcs12_bag_t bag,
+					int indx, char **name);
+int gnutls_pkcs12_bag_set_friendly_name(gnutls_pkcs12_bag_t bag,
+					int indx, const char *name);
+
+/* *INDENT-OFF* */
 #ifdef __cplusplus
 }
 #endif
-
-#endif                          /* GNUTLS_PKCS12_H */
+/* *INDENT-ON* */
+#endif				/* GNUTLS_PKCS12_H */