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

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

@@ -47,18 +47,20 @@
 #endif
 /* Get time_t. */
 #include <time.h>
+
+/* *INDENT-OFF* */
 #ifdef __cplusplus
-extern "C"
-{
+extern "C" {
 #endif
+/* *INDENT-ON* */
 
-#define GNUTLS_VERSION "3.1.11"
+#define GNUTLS_VERSION "3.2.7"
 
 #define GNUTLS_VERSION_MAJOR 3
-#define GNUTLS_VERSION_MINOR 1
-#define GNUTLS_VERSION_PATCH 11
+#define GNUTLS_VERSION_MINOR 2
+#define GNUTLS_VERSION_PATCH 7
 
-#define GNUTLS_VERSION_NUMBER 0x03010b
+#define GNUTLS_VERSION_NUMBER 0x030207
 
 #define GNUTLS_CIPHER_RIJNDAEL_128_CBC GNUTLS_CIPHER_AES_128_CBC
 #define GNUTLS_CIPHER_RIJNDAEL_256_CBC GNUTLS_CIPHER_AES_256_CBC
@@ -82,6 +84,8 @@ extern "C"
  * @GNUTLS_CIPHER_DES_CBC: DES in CBC mode (56-bit keys).
  * @GNUTLS_CIPHER_AES_128_GCM: AES in GCM mode with 128-bit keys.
  * @GNUTLS_CIPHER_AES_256_GCM: AES in GCM mode with 256-bit keys.
+ * @GNUTLS_CIPHER_CAMELLIA_128_GCM: CAMELLIA in GCM mode with 128-bit keys.
+ * @GNUTLS_CIPHER_CAMELLIA_256_GCM: CAMELLIA in GCM mode with 256-bit keys.
  * @GNUTLS_CIPHER_IDEA_PGP_CFB: IDEA in CFB mode.
  * @GNUTLS_CIPHER_3DES_PGP_CFB: 3DES in CFB mode.
  * @GNUTLS_CIPHER_CAST5_PGP_CFB: CAST5 in CFB mode.
@@ -94,36 +98,39 @@ extern "C"
  *
  * Enumeration of different symmetric encryption algorithms.
  */
-  typedef enum gnutls_cipher_algorithm
-  {
-    GNUTLS_CIPHER_UNKNOWN = 0,
-    GNUTLS_CIPHER_NULL = 1,
-    GNUTLS_CIPHER_ARCFOUR_128 = 2,
-    GNUTLS_CIPHER_3DES_CBC = 3,
-    GNUTLS_CIPHER_AES_128_CBC = 4,
-    GNUTLS_CIPHER_AES_256_CBC = 5,
-    GNUTLS_CIPHER_ARCFOUR_40 = 6,
-    GNUTLS_CIPHER_CAMELLIA_128_CBC = 7,
-    GNUTLS_CIPHER_CAMELLIA_256_CBC = 8,
-    GNUTLS_CIPHER_RC2_40_CBC = 90,
-    GNUTLS_CIPHER_DES_CBC = 91,
-    GNUTLS_CIPHER_AES_192_CBC = 92,
-    GNUTLS_CIPHER_AES_128_GCM = 93,
-    GNUTLS_CIPHER_AES_256_GCM = 94,
-    GNUTLS_CIPHER_CAMELLIA_192_CBC = 95,
-
-    /* used only for PGP internals. Ignored in TLS/SSL
-     */
-    GNUTLS_CIPHER_IDEA_PGP_CFB = 200,
-    GNUTLS_CIPHER_3DES_PGP_CFB = 201,
-    GNUTLS_CIPHER_CAST5_PGP_CFB = 202,
-    GNUTLS_CIPHER_BLOWFISH_PGP_CFB = 203,
-    GNUTLS_CIPHER_SAFER_SK128_PGP_CFB = 204,
-    GNUTLS_CIPHER_AES128_PGP_CFB = 205,
-    GNUTLS_CIPHER_AES192_PGP_CFB = 206,
-    GNUTLS_CIPHER_AES256_PGP_CFB = 207,
-    GNUTLS_CIPHER_TWOFISH_PGP_CFB = 208
-  } gnutls_cipher_algorithm_t;
+typedef enum gnutls_cipher_algorithm {
+	GNUTLS_CIPHER_UNKNOWN = 0,
+	GNUTLS_CIPHER_NULL = 1,
+	GNUTLS_CIPHER_ARCFOUR_128 = 2,
+	GNUTLS_CIPHER_3DES_CBC = 3,
+	GNUTLS_CIPHER_AES_128_CBC = 4,
+	GNUTLS_CIPHER_AES_256_CBC = 5,
+	GNUTLS_CIPHER_ARCFOUR_40 = 6,
+	GNUTLS_CIPHER_CAMELLIA_128_CBC = 7,
+	GNUTLS_CIPHER_CAMELLIA_256_CBC = 8,
+	GNUTLS_CIPHER_RC2_40_CBC = 90,
+	GNUTLS_CIPHER_DES_CBC = 91,
+	GNUTLS_CIPHER_AES_192_CBC = 92,
+	GNUTLS_CIPHER_AES_128_GCM = 93,
+	GNUTLS_CIPHER_AES_256_GCM = 94,
+	GNUTLS_CIPHER_CAMELLIA_192_CBC = 95,
+	GNUTLS_CIPHER_SALSA20_256 = 96,
+	GNUTLS_CIPHER_ESTREAM_SALSA20_256 = 97,
+	GNUTLS_CIPHER_CAMELLIA_128_GCM = 98,
+	GNUTLS_CIPHER_CAMELLIA_256_GCM = 99,
+
+	/* used only for PGP internals. Ignored in TLS/SSL
+	 */
+	GNUTLS_CIPHER_IDEA_PGP_CFB = 200,
+	GNUTLS_CIPHER_3DES_PGP_CFB = 201,
+	GNUTLS_CIPHER_CAST5_PGP_CFB = 202,
+	GNUTLS_CIPHER_BLOWFISH_PGP_CFB = 203,
+	GNUTLS_CIPHER_SAFER_SK128_PGP_CFB = 204,
+	GNUTLS_CIPHER_AES128_PGP_CFB = 205,
+	GNUTLS_CIPHER_AES192_PGP_CFB = 206,
+	GNUTLS_CIPHER_AES256_PGP_CFB = 207,
+	GNUTLS_CIPHER_TWOFISH_PGP_CFB = 208
+} gnutls_cipher_algorithm_t;
 
 /**
  * gnutls_kx_algorithm_t:
@@ -136,48 +143,48 @@ extern "C"
  * @GNUTLS_KX_ANON_DH: Anon-DH key-exchange algorithm.
  * @GNUTLS_KX_ANON_ECDH: Anon-ECDH key-exchange algorithm.
  * @GNUTLS_KX_SRP: SRP key-exchange algorithm.
- * @GNUTLS_KX_RSA_EXPORT: RSA-EXPORT key-exchange algorithm.
+ * @GNUTLS_KX_RSA_EXPORT: RSA-EXPORT key-exchange algorithm (defunc).
  * @GNUTLS_KX_SRP_RSA: SRP-RSA key-exchange algorithm.
  * @GNUTLS_KX_SRP_DSS: SRP-DSS key-exchange algorithm.
  * @GNUTLS_KX_PSK: PSK key-exchange algorithm.
  * @GNUTLS_KX_DHE_PSK: DHE-PSK key-exchange algorithm.
  * @GNUTLS_KX_ECDHE_PSK: ECDHE-PSK key-exchange algorithm.
+ * @GNUTLS_KX_RSA_PSK: RSA-PSK key-exchange algorithm.
  *
  * Enumeration of different key exchange algorithms.
  */
-  typedef enum
-  {
-    GNUTLS_KX_UNKNOWN = 0,
-    GNUTLS_KX_RSA = 1,
-    GNUTLS_KX_DHE_DSS = 2,
-    GNUTLS_KX_DHE_RSA = 3,
-    GNUTLS_KX_ANON_DH = 4,
-    GNUTLS_KX_SRP = 5,
-    GNUTLS_KX_RSA_EXPORT = 6,
-    GNUTLS_KX_SRP_RSA = 7,
-    GNUTLS_KX_SRP_DSS = 8,
-    GNUTLS_KX_PSK = 9,
-    GNUTLS_KX_DHE_PSK = 10,
-    GNUTLS_KX_ANON_ECDH = 11,
-    GNUTLS_KX_ECDHE_RSA = 12,
-    GNUTLS_KX_ECDHE_ECDSA = 13,
-    GNUTLS_KX_ECDHE_PSK = 14,
-  } gnutls_kx_algorithm_t;
+typedef enum {
+	GNUTLS_KX_UNKNOWN = 0,
+	GNUTLS_KX_RSA = 1,
+	GNUTLS_KX_DHE_DSS = 2,
+	GNUTLS_KX_DHE_RSA = 3,
+	GNUTLS_KX_ANON_DH = 4,
+	GNUTLS_KX_SRP = 5,
+	GNUTLS_KX_RSA_EXPORT = 6,
+	GNUTLS_KX_SRP_RSA = 7,
+	GNUTLS_KX_SRP_DSS = 8,
+	GNUTLS_KX_PSK = 9,
+	GNUTLS_KX_DHE_PSK = 10,
+	GNUTLS_KX_ANON_ECDH = 11,
+	GNUTLS_KX_ECDHE_RSA = 12,
+	GNUTLS_KX_ECDHE_ECDSA = 13,
+	GNUTLS_KX_ECDHE_PSK = 14,
+	GNUTLS_KX_RSA_PSK = 15,
+} gnutls_kx_algorithm_t;
 
 /**
  * gnutls_params_type_t:
- * @GNUTLS_PARAMS_RSA_EXPORT: Session RSA-EXPORT parameters.
+ * @GNUTLS_PARAMS_RSA_EXPORT: Session RSA-EXPORT parameters (defunc).
  * @GNUTLS_PARAMS_DH: Session Diffie-Hellman parameters.
  * @GNUTLS_PARAMS_ECDH: Session Elliptic-Curve Diffie-Hellman parameters.
  *
  * Enumeration of different TLS session parameter types.
  */
-  typedef enum
-  {
-    GNUTLS_PARAMS_RSA_EXPORT = 1,
-    GNUTLS_PARAMS_DH = 2,
-    GNUTLS_PARAMS_ECDH = 3,
-  } gnutls_params_type_t;
+typedef enum {
+	GNUTLS_PARAMS_RSA_EXPORT = 1,
+	GNUTLS_PARAMS_DH = 2,
+	GNUTLS_PARAMS_ECDH = 3,
+} gnutls_params_type_t;
 
 /**
  * gnutls_credentials_type_t:
@@ -189,14 +196,13 @@ extern "C"
  *
  * Enumeration of different credential types.
  */
-  typedef enum
-  {
-    GNUTLS_CRD_CERTIFICATE = 1,
-    GNUTLS_CRD_ANON,
-    GNUTLS_CRD_SRP,
-    GNUTLS_CRD_PSK,
-    GNUTLS_CRD_IA
-  } gnutls_credentials_type_t;
+typedef enum {
+	GNUTLS_CRD_CERTIFICATE = 1,
+	GNUTLS_CRD_ANON,
+	GNUTLS_CRD_SRP,
+	GNUTLS_CRD_PSK,
+	GNUTLS_CRD_IA
+} gnutls_credentials_type_t;
 
 #define GNUTLS_MAC_SHA GNUTLS_MAC_SHA1
 #define GNUTLS_DIG_SHA GNUTLS_DIG_SHA1
@@ -214,26 +220,29 @@ extern "C"
  * @GNUTLS_MAC_SHA512: HMAC-SHA-512 algorithm.
  * @GNUTLS_MAC_SHA224: HMAC-SHA-224 algorithm.
  * @GNUTLS_MAC_AEAD: MAC implicit through AEAD cipher.
+ * @GNUTLS_MAC_UMAC_96: The UMAC-96 MAC algorithm.
+ * @GNUTLS_MAC_UMAC_128: The UMAC-128 MAC algorithm.
  *
  * Enumeration of different Message Authentication Code (MAC)
  * algorithms.
  */
-  typedef enum
-  {
-    GNUTLS_MAC_UNKNOWN = 0,
-    GNUTLS_MAC_NULL = 1,
-    GNUTLS_MAC_MD5 = 2,
-    GNUTLS_MAC_SHA1 = 3,
-    GNUTLS_MAC_RMD160 = 4,
-    GNUTLS_MAC_MD2 = 5,
-    GNUTLS_MAC_SHA256 = 6,
-    GNUTLS_MAC_SHA384 = 7,
-    GNUTLS_MAC_SHA512 = 8,
-    GNUTLS_MAC_SHA224 = 9,
-      /* If you add anything here, make sure you align with
-         gnutls_digest_algorithm_t. */
-    GNUTLS_MAC_AEAD = 200 /* indicates that MAC is on the cipher */
-  } gnutls_mac_algorithm_t;
+typedef enum {
+	GNUTLS_MAC_UNKNOWN = 0,
+	GNUTLS_MAC_NULL = 1,
+	GNUTLS_MAC_MD5 = 2,
+	GNUTLS_MAC_SHA1 = 3,
+	GNUTLS_MAC_RMD160 = 4,
+	GNUTLS_MAC_MD2 = 5,
+	GNUTLS_MAC_SHA256 = 6,
+	GNUTLS_MAC_SHA384 = 7,
+	GNUTLS_MAC_SHA512 = 8,
+	GNUTLS_MAC_SHA224 = 9,
+	/* If you add anything here, make sure you align with
+	   gnutls_digest_algorithm_t. */
+	GNUTLS_MAC_AEAD = 200,	/* indicates that MAC is on the cipher */
+	GNUTLS_MAC_UMAC_96 = 201,
+	GNUTLS_MAC_UMAC_128 = 202,
+} gnutls_mac_algorithm_t;
 
 /**
  * gnutls_digest_algorithm_t:
@@ -250,21 +259,20 @@ extern "C"
  *
  * Enumeration of different digest (hash) algorithms.
  */
-  typedef enum
-  {
-    GNUTLS_DIG_UNKNOWN = GNUTLS_MAC_UNKNOWN,
-    GNUTLS_DIG_NULL = GNUTLS_MAC_NULL,
-    GNUTLS_DIG_MD5 = GNUTLS_MAC_MD5,
-    GNUTLS_DIG_SHA1 = GNUTLS_MAC_SHA1,
-    GNUTLS_DIG_RMD160 = GNUTLS_MAC_RMD160,
-    GNUTLS_DIG_MD2 = GNUTLS_MAC_MD2,
-    GNUTLS_DIG_SHA256 = GNUTLS_MAC_SHA256,
-    GNUTLS_DIG_SHA384 = GNUTLS_MAC_SHA384,
-    GNUTLS_DIG_SHA512 = GNUTLS_MAC_SHA512,
-    GNUTLS_DIG_SHA224 = GNUTLS_MAC_SHA224
-      /* If you add anything here, make sure you align with
-         gnutls_mac_algorithm_t. */
-  } gnutls_digest_algorithm_t;
+typedef enum {
+	GNUTLS_DIG_UNKNOWN = GNUTLS_MAC_UNKNOWN,
+	GNUTLS_DIG_NULL = GNUTLS_MAC_NULL,
+	GNUTLS_DIG_MD5 = GNUTLS_MAC_MD5,
+	GNUTLS_DIG_SHA1 = GNUTLS_MAC_SHA1,
+	GNUTLS_DIG_RMD160 = GNUTLS_MAC_RMD160,
+	GNUTLS_DIG_MD2 = GNUTLS_MAC_MD2,
+	GNUTLS_DIG_SHA256 = GNUTLS_MAC_SHA256,
+	GNUTLS_DIG_SHA384 = GNUTLS_MAC_SHA384,
+	GNUTLS_DIG_SHA512 = GNUTLS_MAC_SHA512,
+	GNUTLS_DIG_SHA224 = GNUTLS_MAC_SHA224
+	    /* If you add anything here, make sure you align with
+	       gnutls_mac_algorithm_t. */
+} gnutls_digest_algorithm_t;
 
   /* exported for other gnutls headers. This is the maximum number of
    * algorithms (ciphers, kx or macs).
@@ -280,13 +288,12 @@ extern "C"
  *
  * Enumeration of different TLS compression methods.
  */
-  typedef enum
-  {
-    GNUTLS_COMP_UNKNOWN = 0,
-    GNUTLS_COMP_NULL = 1,
-    GNUTLS_COMP_DEFLATE = 2,
-    GNUTLS_COMP_ZLIB = GNUTLS_COMP_DEFLATE,
-  } gnutls_compression_method_t;
+typedef enum {
+	GNUTLS_COMP_UNKNOWN = 0,
+	GNUTLS_COMP_NULL = 1,
+	GNUTLS_COMP_DEFLATE = 2,
+	GNUTLS_COMP_ZLIB = GNUTLS_COMP_DEFLATE,
+} gnutls_compression_method_t;
 
   /*
    * Flags for gnutls_init()
@@ -296,6 +303,7 @@ extern "C"
    * @GNUTLS_DATAGRAM: Connection is datagram oriented (DTLS).
    * @GNUTLS_NONBLOCK: Connection should not block (DTLS).
    * @GNUTLS_NO_EXTENSIONS: Do not enable any TLS extensions by default.
+   * @GNUTLS_NO_REPLAY_PROTECTION: Disable any replay protection in DTLS.
    *
    */
 #define GNUTLS_SERVER 1
@@ -303,6 +311,7 @@ extern "C"
 #define GNUTLS_DATAGRAM (1<<2)
 #define GNUTLS_NONBLOCK (1<<3)
 #define GNUTLS_NO_EXTENSIONS (1<<4)
+#define GNUTLS_NO_REPLAY_PROTECTION (1<<5)
 
 /**
  * gnutls_alert_level_t:
@@ -311,11 +320,10 @@ extern "C"
  *
  * Enumeration of different TLS alert severities.
  */
-  typedef enum
-  {
-    GNUTLS_AL_WARNING = 1,
-    GNUTLS_AL_FATAL
-  } gnutls_alert_level_t;
+typedef enum {
+	GNUTLS_AL_WARNING = 1,
+	GNUTLS_AL_FATAL
+} gnutls_alert_level_t;
 
 /**
  * gnutls_alert_description_t:
@@ -354,37 +362,37 @@ extern "C"
  *
  * Enumeration of different TLS alerts.
  */
-  typedef enum
-  {
-    GNUTLS_A_CLOSE_NOTIFY,
-    GNUTLS_A_UNEXPECTED_MESSAGE = 10,
-    GNUTLS_A_BAD_RECORD_MAC = 20,
-    GNUTLS_A_DECRYPTION_FAILED,
-    GNUTLS_A_RECORD_OVERFLOW,
-    GNUTLS_A_DECOMPRESSION_FAILURE = 30,
-    GNUTLS_A_HANDSHAKE_FAILURE = 40,
-    GNUTLS_A_SSL3_NO_CERTIFICATE = 41,
-    GNUTLS_A_BAD_CERTIFICATE = 42,
-    GNUTLS_A_UNSUPPORTED_CERTIFICATE,
-    GNUTLS_A_CERTIFICATE_REVOKED,
-    GNUTLS_A_CERTIFICATE_EXPIRED,
-    GNUTLS_A_CERTIFICATE_UNKNOWN,
-    GNUTLS_A_ILLEGAL_PARAMETER,
-    GNUTLS_A_UNKNOWN_CA,
-    GNUTLS_A_ACCESS_DENIED,
-    GNUTLS_A_DECODE_ERROR = 50,
-    GNUTLS_A_DECRYPT_ERROR,
-    GNUTLS_A_EXPORT_RESTRICTION = 60,
-    GNUTLS_A_PROTOCOL_VERSION = 70,
-    GNUTLS_A_INSUFFICIENT_SECURITY,
-    GNUTLS_A_INTERNAL_ERROR = 80,
-    GNUTLS_A_USER_CANCELED = 90,
-    GNUTLS_A_NO_RENEGOTIATION = 100,
-    GNUTLS_A_UNSUPPORTED_EXTENSION = 110,
-    GNUTLS_A_CERTIFICATE_UNOBTAINABLE = 111,
-    GNUTLS_A_UNRECOGNIZED_NAME = 112,
-    GNUTLS_A_UNKNOWN_PSK_IDENTITY = 115,
-  } gnutls_alert_description_t;
+typedef enum {
+	GNUTLS_A_CLOSE_NOTIFY,
+	GNUTLS_A_UNEXPECTED_MESSAGE = 10,
+	GNUTLS_A_BAD_RECORD_MAC = 20,
+	GNUTLS_A_DECRYPTION_FAILED,
+	GNUTLS_A_RECORD_OVERFLOW,
+	GNUTLS_A_DECOMPRESSION_FAILURE = 30,
+	GNUTLS_A_HANDSHAKE_FAILURE = 40,
+	GNUTLS_A_SSL3_NO_CERTIFICATE = 41,
+	GNUTLS_A_BAD_CERTIFICATE = 42,
+	GNUTLS_A_UNSUPPORTED_CERTIFICATE,
+	GNUTLS_A_CERTIFICATE_REVOKED,
+	GNUTLS_A_CERTIFICATE_EXPIRED,
+	GNUTLS_A_CERTIFICATE_UNKNOWN,
+	GNUTLS_A_ILLEGAL_PARAMETER,
+	GNUTLS_A_UNKNOWN_CA,
+	GNUTLS_A_ACCESS_DENIED,
+	GNUTLS_A_DECODE_ERROR = 50,
+	GNUTLS_A_DECRYPT_ERROR,
+	GNUTLS_A_EXPORT_RESTRICTION = 60,
+	GNUTLS_A_PROTOCOL_VERSION = 70,
+	GNUTLS_A_INSUFFICIENT_SECURITY,
+	GNUTLS_A_INTERNAL_ERROR = 80,
+	GNUTLS_A_USER_CANCELED = 90,
+	GNUTLS_A_NO_RENEGOTIATION = 100,
+	GNUTLS_A_UNSUPPORTED_EXTENSION = 110,
+	GNUTLS_A_CERTIFICATE_UNOBTAINABLE = 111,
+	GNUTLS_A_UNRECOGNIZED_NAME = 112,
+	GNUTLS_A_UNKNOWN_PSK_IDENTITY = 115,
+	GNUTLS_A_NO_APPLICATION_PROTOCOL = 120,
+} gnutls_alert_description_t;
 
 /**
  * gnutls_handshake_description_t:
@@ -407,25 +415,30 @@ extern "C"
  *
  * Enumeration of different TLS handshake packets.
  */
-  typedef enum
-  {
-    GNUTLS_HANDSHAKE_HELLO_REQUEST = 0,
-    GNUTLS_HANDSHAKE_CLIENT_HELLO = 1,
-    GNUTLS_HANDSHAKE_SERVER_HELLO = 2,
-    GNUTLS_HANDSHAKE_HELLO_VERIFY_REQUEST = 3,
-    GNUTLS_HANDSHAKE_NEW_SESSION_TICKET = 4,
-    GNUTLS_HANDSHAKE_CERTIFICATE_PKT = 11,
-    GNUTLS_HANDSHAKE_SERVER_KEY_EXCHANGE = 12,
-    GNUTLS_HANDSHAKE_CERTIFICATE_REQUEST = 13,
-    GNUTLS_HANDSHAKE_SERVER_HELLO_DONE = 14,
-    GNUTLS_HANDSHAKE_CERTIFICATE_VERIFY = 15,
-    GNUTLS_HANDSHAKE_CLIENT_KEY_EXCHANGE = 16,
-    GNUTLS_HANDSHAKE_FINISHED = 20,
-    GNUTLS_HANDSHAKE_CERTIFICATE_STATUS = 22,
-    GNUTLS_HANDSHAKE_SUPPLEMENTAL = 23,
-    GNUTLS_HANDSHAKE_CHANGE_CIPHER_SPEC = 254,
-    GNUTLS_HANDSHAKE_CLIENT_HELLO_V2 = 1024,
-  } gnutls_handshake_description_t;
+typedef enum {
+	GNUTLS_HANDSHAKE_HELLO_REQUEST = 0,
+	GNUTLS_HANDSHAKE_CLIENT_HELLO = 1,
+	GNUTLS_HANDSHAKE_SERVER_HELLO = 2,
+	GNUTLS_HANDSHAKE_HELLO_VERIFY_REQUEST = 3,
+	GNUTLS_HANDSHAKE_NEW_SESSION_TICKET = 4,
+	GNUTLS_HANDSHAKE_CERTIFICATE_PKT = 11,
+	GNUTLS_HANDSHAKE_SERVER_KEY_EXCHANGE = 12,
+	GNUTLS_HANDSHAKE_CERTIFICATE_REQUEST = 13,
+	GNUTLS_HANDSHAKE_SERVER_HELLO_DONE = 14,
+	GNUTLS_HANDSHAKE_CERTIFICATE_VERIFY = 15,
+	GNUTLS_HANDSHAKE_CLIENT_KEY_EXCHANGE = 16,
+	GNUTLS_HANDSHAKE_FINISHED = 20,
+	GNUTLS_HANDSHAKE_CERTIFICATE_STATUS = 22,
+	GNUTLS_HANDSHAKE_SUPPLEMENTAL = 23,
+	GNUTLS_HANDSHAKE_CHANGE_CIPHER_SPEC = 254,
+	GNUTLS_HANDSHAKE_CLIENT_HELLO_V2 = 1024,
+} gnutls_handshake_description_t;
+
+#define GNUTLS_HANDSHAKE_ANY ((unsigned int)-1)
+
+const char
+    *gnutls_handshake_description_get_name(gnutls_handshake_description_t
+					   type);
 
 /**
  * gnutls_certificate_status_t:
@@ -456,22 +469,21 @@ extern "C"
  * bits may have different meanings in OpenPGP keys and X.509
  * certificate verification.
  */
-  typedef enum
-  {
-    GNUTLS_CERT_INVALID = 1<<1,
-    GNUTLS_CERT_REVOKED = 1<<5,
-    GNUTLS_CERT_SIGNER_NOT_FOUND = 1<<6,
-    GNUTLS_CERT_SIGNER_NOT_CA = 1<<7,
-    GNUTLS_CERT_INSECURE_ALGORITHM = 1<<8,
-    GNUTLS_CERT_NOT_ACTIVATED = 1<<9,
-    GNUTLS_CERT_EXPIRED = 1<<10,
-    GNUTLS_CERT_SIGNATURE_FAILURE = 1<<11,
-    GNUTLS_CERT_REVOCATION_DATA_SUPERSEDED = 1<<12,
-    GNUTLS_CERT_UNEXPECTED_OWNER = 1<<14,
-    GNUTLS_CERT_REVOCATION_DATA_ISSUED_IN_FUTURE = 1<<15,
-    GNUTLS_CERT_SIGNER_CONSTRAINTS_FAILURE = 1<<16,
-    GNUTLS_CERT_MISMATCH = 1<<17,
-  } gnutls_certificate_status_t;
+typedef enum {
+	GNUTLS_CERT_INVALID = 1 << 1,
+	GNUTLS_CERT_REVOKED = 1 << 5,
+	GNUTLS_CERT_SIGNER_NOT_FOUND = 1 << 6,
+	GNUTLS_CERT_SIGNER_NOT_CA = 1 << 7,
+	GNUTLS_CERT_INSECURE_ALGORITHM = 1 << 8,
+	GNUTLS_CERT_NOT_ACTIVATED = 1 << 9,
+	GNUTLS_CERT_EXPIRED = 1 << 10,
+	GNUTLS_CERT_SIGNATURE_FAILURE = 1 << 11,
+	GNUTLS_CERT_REVOCATION_DATA_SUPERSEDED = 1 << 12,
+	GNUTLS_CERT_UNEXPECTED_OWNER = 1 << 14,
+	GNUTLS_CERT_REVOCATION_DATA_ISSUED_IN_FUTURE = 1 << 15,
+	GNUTLS_CERT_SIGNER_CONSTRAINTS_FAILURE = 1 << 16,
+	GNUTLS_CERT_MISMATCH = 1 << 17,
+} gnutls_certificate_status_t;
 
 /**
  * gnutls_certificate_request_t:
@@ -481,12 +493,11 @@ extern "C"
  *
  * Enumeration of certificate request types.
  */
-  typedef enum
-  {
-    GNUTLS_CERT_IGNORE = 0,
-    GNUTLS_CERT_REQUEST = 1,
-    GNUTLS_CERT_REQUIRE = 2
-  } gnutls_certificate_request_t;
+typedef enum {
+	GNUTLS_CERT_IGNORE = 0,
+	GNUTLS_CERT_REQUEST = 1,
+	GNUTLS_CERT_REQUIRE = 2
+} gnutls_certificate_request_t;
 
 /**
  * gnutls_openpgp_crt_status_t:
@@ -495,11 +506,10 @@ extern "C"
  *
  * Enumeration of ways to send OpenPGP certificate.
  */
-  typedef enum
-  {
-    GNUTLS_OPENPGP_CERT = 0,
-    GNUTLS_OPENPGP_CERT_FINGERPRINT = 1
-  } gnutls_openpgp_crt_status_t;
+typedef enum {
+	GNUTLS_OPENPGP_CERT = 0,
+	GNUTLS_OPENPGP_CERT_FINGERPRINT = 1
+} gnutls_openpgp_crt_status_t;
 
 /**
  * gnutls_close_request_t:
@@ -508,11 +518,10 @@ extern "C"
  *
  * Enumeration of how TLS session should be terminated.  See gnutls_bye().
  */
-  typedef enum
-  {
-    GNUTLS_SHUT_RDWR = 0,
-    GNUTLS_SHUT_WR = 1
-  } gnutls_close_request_t;
+typedef enum {
+	GNUTLS_SHUT_RDWR = 0,
+	GNUTLS_SHUT_WR = 1
+} gnutls_close_request_t;
 
 /**
  * gnutls_protocol_t:
@@ -522,24 +531,27 @@ extern "C"
  * @GNUTLS_TLS1_1: TLS version 1.1.
  * @GNUTLS_TLS1_2: TLS version 1.2.
  * @GNUTLS_DTLS1_0: DTLS version 1.0.
+ * @GNUTLS_DTLS1_2: DTLS version 1.2.
  * @GNUTLS_DTLS0_9: DTLS version 0.9 (Cisco AnyConnect / OpenSSL 0.9.8e).
  * @GNUTLS_VERSION_MAX: Maps to the highest supported TLS version.
  * @GNUTLS_VERSION_UNKNOWN: Unknown SSL/TLS version.
  *
  * Enumeration of different SSL/TLS protocol versions.
  */
-  typedef enum
-  {
-    GNUTLS_SSL3 = 1,
-    GNUTLS_TLS1_0 = 2,
-    GNUTLS_TLS1 = GNUTLS_TLS1_0,
-    GNUTLS_TLS1_1 = 3,
-    GNUTLS_TLS1_2 = 4,
-    GNUTLS_DTLS1_0 = 5,
-    GNUTLS_DTLS0_9 = 6,
-    GNUTLS_VERSION_MAX = GNUTLS_DTLS0_9,
-    GNUTLS_VERSION_UNKNOWN = 0xff
-  } gnutls_protocol_t;
+typedef enum {
+	GNUTLS_SSL3 = 1,
+	GNUTLS_TLS1_0 = 2,
+	GNUTLS_TLS1 = GNUTLS_TLS1_0,
+	GNUTLS_TLS1_1 = 3,
+	GNUTLS_TLS1_2 = 4,
+	GNUTLS_DTLS0_9 = 6,	/* FIXME: at some point change it to 200 */
+	GNUTLS_DTLS1_0 = 5,	/* 201 */
+	GNUTLS_DTLS1_2 = 202,
+	GNUTLS_DTLS_VERSION_MIN = GNUTLS_DTLS1_0,
+	GNUTLS_DTLS_VERSION_MAX = GNUTLS_DTLS1_2,
+	GNUTLS_TLS_VERSION_MAX = GNUTLS_TLS1_2,
+	GNUTLS_VERSION_UNKNOWN = 0xff	/* change it to 0xffff */
+} gnutls_protocol_t;
 
 /**
  * gnutls_certificate_type_t:
@@ -550,13 +562,12 @@ extern "C"
  *
  * Enumeration of different certificate types.
  */
-  typedef enum
-  {
-    GNUTLS_CRT_UNKNOWN = 0,
-    GNUTLS_CRT_X509 = 1,
-    GNUTLS_CRT_OPENPGP = 2,
-    GNUTLS_CRT_RAW = 3
-  } gnutls_certificate_type_t;
+typedef enum {
+	GNUTLS_CRT_UNKNOWN = 0,
+	GNUTLS_CRT_X509 = 1,
+	GNUTLS_CRT_OPENPGP = 2,
+	GNUTLS_CRT_RAW = 3
+} gnutls_certificate_type_t;
 
 /**
  * gnutls_x509_crt_fmt_t:
@@ -565,11 +576,10 @@ extern "C"
  *
  * Enumeration of different certificate encoding formats.
  */
-  typedef enum
-  {
-    GNUTLS_X509_FMT_DER = 0,
-    GNUTLS_X509_FMT_PEM = 1
-  } gnutls_x509_crt_fmt_t;
+typedef enum {
+	GNUTLS_X509_FMT_DER = 0,
+	GNUTLS_X509_FMT_PEM = 1
+} gnutls_x509_crt_fmt_t;
 
 /**
  * gnutls_certificate_print_formats_t:
@@ -581,14 +591,13 @@ extern "C"
  *
  * Enumeration of different certificate printing variants.
  */
-  typedef enum gnutls_certificate_print_formats
-  {
-    GNUTLS_CRT_PRINT_FULL = 0,
-    GNUTLS_CRT_PRINT_ONELINE = 1,
-    GNUTLS_CRT_PRINT_UNSIGNED_FULL = 2,
-    GNUTLS_CRT_PRINT_COMPACT = 3,
-    GNUTLS_CRT_PRINT_FULL_NUMBERS = 4,
-  } gnutls_certificate_print_formats_t;
+typedef enum gnutls_certificate_print_formats {
+	GNUTLS_CRT_PRINT_FULL = 0,
+	GNUTLS_CRT_PRINT_ONELINE = 1,
+	GNUTLS_CRT_PRINT_UNSIGNED_FULL = 2,
+	GNUTLS_CRT_PRINT_COMPACT = 3,
+	GNUTLS_CRT_PRINT_FULL_NUMBERS = 4,
+} gnutls_certificate_print_formats_t;
 
 #define GNUTLS_PK_ECC GNUTLS_PK_EC
 /**
@@ -601,16 +610,15 @@ extern "C"
  *
  * Enumeration of different public-key algorithms.
  */
-  typedef enum
-  {
-    GNUTLS_PK_UNKNOWN = 0,
-    GNUTLS_PK_RSA = 1,
-    GNUTLS_PK_DSA = 2,
-    GNUTLS_PK_DH = 3,
-    GNUTLS_PK_EC = 4,
-  } gnutls_pk_algorithm_t;
+typedef enum {
+	GNUTLS_PK_UNKNOWN = 0,
+	GNUTLS_PK_RSA = 1,
+	GNUTLS_PK_DSA = 2,
+	GNUTLS_PK_DH = 3,
+	GNUTLS_PK_EC = 4,
+} gnutls_pk_algorithm_t;
 
-  const char *gnutls_pk_algorithm_get_name (gnutls_pk_algorithm_t algorithm);
+const char *gnutls_pk_algorithm_get_name(gnutls_pk_algorithm_t algorithm);
 
 /**
  * gnutls_sign_algorithm_t:
@@ -636,28 +644,27 @@ extern "C"
  *
  * Enumeration of different digital signature algorithms.
  */
-  typedef enum
-  {
-    GNUTLS_SIGN_UNKNOWN = 0,
-    GNUTLS_SIGN_RSA_SHA1 = 1,
-    GNUTLS_SIGN_RSA_SHA = GNUTLS_SIGN_RSA_SHA1,
-    GNUTLS_SIGN_DSA_SHA1 = 2,
-    GNUTLS_SIGN_DSA_SHA = GNUTLS_SIGN_DSA_SHA1,
-    GNUTLS_SIGN_RSA_MD5 = 3,
-    GNUTLS_SIGN_RSA_MD2 = 4,
-    GNUTLS_SIGN_RSA_RMD160 = 5,
-    GNUTLS_SIGN_RSA_SHA256 = 6,
-    GNUTLS_SIGN_RSA_SHA384 = 7,
-    GNUTLS_SIGN_RSA_SHA512 = 8,
-    GNUTLS_SIGN_RSA_SHA224 = 9,
-    GNUTLS_SIGN_DSA_SHA224 = 10,
-    GNUTLS_SIGN_DSA_SHA256 = 11,
-    GNUTLS_SIGN_ECDSA_SHA1 = 12,
-    GNUTLS_SIGN_ECDSA_SHA224 = 13,
-    GNUTLS_SIGN_ECDSA_SHA256 = 14,
-    GNUTLS_SIGN_ECDSA_SHA384 = 15,
-    GNUTLS_SIGN_ECDSA_SHA512 = 16,
-  } gnutls_sign_algorithm_t;
+typedef enum {
+	GNUTLS_SIGN_UNKNOWN = 0,
+	GNUTLS_SIGN_RSA_SHA1 = 1,
+	GNUTLS_SIGN_RSA_SHA = GNUTLS_SIGN_RSA_SHA1,
+	GNUTLS_SIGN_DSA_SHA1 = 2,
+	GNUTLS_SIGN_DSA_SHA = GNUTLS_SIGN_DSA_SHA1,
+	GNUTLS_SIGN_RSA_MD5 = 3,
+	GNUTLS_SIGN_RSA_MD2 = 4,
+	GNUTLS_SIGN_RSA_RMD160 = 5,
+	GNUTLS_SIGN_RSA_SHA256 = 6,
+	GNUTLS_SIGN_RSA_SHA384 = 7,
+	GNUTLS_SIGN_RSA_SHA512 = 8,
+	GNUTLS_SIGN_RSA_SHA224 = 9,
+	GNUTLS_SIGN_DSA_SHA224 = 10,
+	GNUTLS_SIGN_DSA_SHA256 = 11,
+	GNUTLS_SIGN_ECDSA_SHA1 = 12,
+	GNUTLS_SIGN_ECDSA_SHA224 = 13,
+	GNUTLS_SIGN_ECDSA_SHA256 = 14,
+	GNUTLS_SIGN_ECDSA_SHA384 = 15,
+	GNUTLS_SIGN_ECDSA_SHA512 = 16,
+} gnutls_sign_algorithm_t;
 
 /**
  * gnutls_ecc_curve_t:
@@ -670,16 +677,21 @@ extern "C"
  *
  * Enumeration of ECC curves.
  */
-typedef enum
-{
-  GNUTLS_ECC_CURVE_INVALID=0,
-  GNUTLS_ECC_CURVE_SECP224R1,
-  GNUTLS_ECC_CURVE_SECP256R1,
-  GNUTLS_ECC_CURVE_SECP384R1,
-  GNUTLS_ECC_CURVE_SECP521R1,
-  GNUTLS_ECC_CURVE_SECP192R1,
+typedef enum {
+	GNUTLS_ECC_CURVE_INVALID = 0,
+	GNUTLS_ECC_CURVE_SECP224R1,
+	GNUTLS_ECC_CURVE_SECP256R1,
+	GNUTLS_ECC_CURVE_SECP384R1,
+	GNUTLS_ECC_CURVE_SECP521R1,
+	GNUTLS_ECC_CURVE_SECP192R1,
 } gnutls_ecc_curve_t;
 
+/* macros to allow specifying a specific curve in gnutls_privkey_generate()
+ * and gnutls_x509_privkey_generate() */
+#define GNUTLS_CURVE_TO_BITS(curve) (unsigned int)((1<<31)|(curve))
+#define GNUTLS_BITS_TO_CURVE(bits) ((bits) & 0x7FFFFFFF)
+#define GNUTLS_BITS_ARE_CURVE(bits) ((bits) & 0x80000000)
+
 /**
  * gnutls_sec_param_t:
  * @GNUTLS_SEC_PARAM_UNKNOWN: Cannot be known
@@ -695,19 +707,18 @@ typedef enum
  *
  * Enumeration of security parameters for passive attacks.
  */
-  typedef enum
-  {
-    GNUTLS_SEC_PARAM_INSECURE = -20,
-    GNUTLS_SEC_PARAM_EXPORT = -15,
-    GNUTLS_SEC_PARAM_VERY_WEAK = -12,
-    GNUTLS_SEC_PARAM_WEAK = -10,
-    GNUTLS_SEC_PARAM_UNKNOWN = 0,
-    GNUTLS_SEC_PARAM_LOW = 1,
-    GNUTLS_SEC_PARAM_LEGACY = 2,
-    GNUTLS_SEC_PARAM_NORMAL = 3,
-    GNUTLS_SEC_PARAM_HIGH = 4,
-    GNUTLS_SEC_PARAM_ULTRA = 5,
-  } gnutls_sec_param_t;
+typedef enum {
+	GNUTLS_SEC_PARAM_INSECURE = -20,
+	GNUTLS_SEC_PARAM_EXPORT = -15,
+	GNUTLS_SEC_PARAM_VERY_WEAK = -12,
+	GNUTLS_SEC_PARAM_WEAK = -10,
+	GNUTLS_SEC_PARAM_UNKNOWN = 0,
+	GNUTLS_SEC_PARAM_LOW = 1,
+	GNUTLS_SEC_PARAM_LEGACY = 2,
+	GNUTLS_SEC_PARAM_NORMAL = 3,
+	GNUTLS_SEC_PARAM_HIGH = 4,
+	GNUTLS_SEC_PARAM_ULTRA = 5,
+} gnutls_sec_param_t;
 
 /**
  * gnutls_channel_binding_t:
@@ -715,235 +726,244 @@ typedef enum
  *
  * Enumeration of support channel binding types.
  */
-  typedef enum
-  {
-    GNUTLS_CB_TLS_UNIQUE
-  } gnutls_channel_binding_t;
+typedef enum {
+	GNUTLS_CB_TLS_UNIQUE
+} gnutls_channel_binding_t;
 
 
 /* If you want to change this, then also change the define in
  * gnutls_int.h, and recompile.
  */
-  typedef void *gnutls_transport_ptr_t;
+typedef void *gnutls_transport_ptr_t;
 
-  struct gnutls_session_int;
-  typedef struct gnutls_session_int *gnutls_session_t;
+struct gnutls_session_int;
+typedef struct gnutls_session_int *gnutls_session_t;
 
-  struct gnutls_dh_params_int;
-  typedef struct gnutls_dh_params_int *gnutls_dh_params_t;
+struct gnutls_dh_params_int;
+typedef struct gnutls_dh_params_int *gnutls_dh_params_t;
 
-  struct gnutls_ecdh_params_int;
-  typedef struct gnutls_ecdh_params_int *gnutls_ecdh_params_t;
+struct gnutls_ecdh_params_int;
+typedef struct gnutls_ecdh_params_int *gnutls_ecdh_params_t;
 
   /* XXX ugly. */
-  struct gnutls_x509_privkey_int;
-  typedef struct gnutls_x509_privkey_int *gnutls_rsa_params_t;
-
-  struct gnutls_priority_st;
-  typedef struct gnutls_priority_st *gnutls_priority_t;
-
-  typedef struct
-  {
-    unsigned char *data;
-    unsigned int size;
-  } gnutls_datum_t;
-
-
-  typedef struct gnutls_params_st
-  {
-    gnutls_params_type_t type;
-    union params
-    {
-      gnutls_dh_params_t dh;
-      gnutls_ecdh_params_t ecdh;
-      gnutls_rsa_params_t rsa_export;
-    } params;
-    int deinit;
-  } gnutls_params_st;
-
-  typedef int gnutls_params_function (gnutls_session_t, gnutls_params_type_t,
-                                      gnutls_params_st *);
+struct gnutls_x509_privkey_int;
+typedef struct gnutls_x509_privkey_int *gnutls_rsa_params_t;
+
+struct gnutls_priority_st;
+typedef struct gnutls_priority_st *gnutls_priority_t;
+
+typedef struct {
+	unsigned char *data;
+	unsigned int size;
+} gnutls_datum_t;
+
+
+typedef struct gnutls_params_st {
+	gnutls_params_type_t type;
+	union params {
+		gnutls_dh_params_t dh;
+		gnutls_ecdh_params_t ecdh;
+		gnutls_rsa_params_t rsa_export;
+	} params;
+	int deinit;
+} gnutls_params_st;
+
+typedef int gnutls_params_function(gnutls_session_t, gnutls_params_type_t,
+				   gnutls_params_st *);
 
 /* internal functions */
 
-  int gnutls_init (gnutls_session_t * session,
-                   unsigned int flags);
-  void gnutls_deinit (gnutls_session_t session);
+int gnutls_init(gnutls_session_t * session, unsigned int flags);
+void gnutls_deinit(gnutls_session_t session);
 #define _gnutls_deinit(x) gnutls_deinit(x)
 
-  int gnutls_bye (gnutls_session_t session, gnutls_close_request_t how);
+int gnutls_bye(gnutls_session_t session, gnutls_close_request_t how);
 
-  int gnutls_handshake (gnutls_session_t session);
+int gnutls_handshake(gnutls_session_t session);
 
 #define GNUTLS_DEFAULT_HANDSHAKE_TIMEOUT ((unsigned int)-1)
-  void gnutls_handshake_set_timeout (gnutls_session_t session,
-				     unsigned int ms);
-  int gnutls_rehandshake (gnutls_session_t session);
-
-  gnutls_alert_description_t gnutls_alert_get (gnutls_session_t session);
-  int gnutls_alert_send (gnutls_session_t session,
-                         gnutls_alert_level_t level,
-                         gnutls_alert_description_t desc);
-  int gnutls_alert_send_appropriate (gnutls_session_t session, int err);
-  const char *gnutls_alert_get_name (gnutls_alert_description_t alert);
-  const char * gnutls_alert_get_strname (gnutls_alert_description_t alert);
-
-  gnutls_sec_param_t gnutls_pk_bits_to_sec_param (gnutls_pk_algorithm_t algo,
-                                                  unsigned int bits);
-  const char *gnutls_sec_param_get_name (gnutls_sec_param_t param);
-  unsigned int gnutls_sec_param_to_pk_bits (gnutls_pk_algorithm_t algo,
-                                            gnutls_sec_param_t param);
+void gnutls_handshake_set_timeout(gnutls_session_t session,
+				  unsigned int ms);
+int gnutls_rehandshake(gnutls_session_t session);
+
+gnutls_alert_description_t gnutls_alert_get(gnutls_session_t session);
+int gnutls_alert_send(gnutls_session_t session,
+		      gnutls_alert_level_t level,
+		      gnutls_alert_description_t desc);
+int gnutls_alert_send_appropriate(gnutls_session_t session, int err);
+const char *gnutls_alert_get_name(gnutls_alert_description_t alert);
+const char *gnutls_alert_get_strname(gnutls_alert_description_t alert);
+
+gnutls_sec_param_t gnutls_pk_bits_to_sec_param(gnutls_pk_algorithm_t algo,
+					       unsigned int bits);
+const char *gnutls_sec_param_get_name(gnutls_sec_param_t param);
+unsigned int gnutls_sec_param_to_pk_bits(gnutls_pk_algorithm_t algo,
+					 gnutls_sec_param_t param);
 
 /* Elliptic curves */
-const char * gnutls_ecc_curve_get_name (gnutls_ecc_curve_t curve);
-int gnutls_ecc_curve_get_size (gnutls_ecc_curve_t curve);
+const char *gnutls_ecc_curve_get_name(gnutls_ecc_curve_t curve);
+int gnutls_ecc_curve_get_size(gnutls_ecc_curve_t curve);
 gnutls_ecc_curve_t gnutls_ecc_curve_get(gnutls_session_t session);
 
 /* get information on the current session */
-  gnutls_cipher_algorithm_t gnutls_cipher_get (gnutls_session_t session);
-  gnutls_kx_algorithm_t gnutls_kx_get (gnutls_session_t session);
-  gnutls_mac_algorithm_t gnutls_mac_get (gnutls_session_t session);
-  gnutls_compression_method_t
-    gnutls_compression_get (gnutls_session_t session);
-  gnutls_certificate_type_t
-    gnutls_certificate_type_get (gnutls_session_t session);
-    
-  int gnutls_sign_algorithm_get (gnutls_session_t session);
-  int gnutls_sign_algorithm_get_client (gnutls_session_t session);
-
-  int gnutls_sign_algorithm_get_requested (gnutls_session_t session,
-                                           size_t indx,
-                                           gnutls_sign_algorithm_t * algo);
-
-  size_t gnutls_cipher_get_key_size (gnutls_cipher_algorithm_t algorithm);
-  size_t gnutls_mac_get_key_size (gnutls_mac_algorithm_t algorithm);
+gnutls_cipher_algorithm_t gnutls_cipher_get(gnutls_session_t session);
+gnutls_kx_algorithm_t gnutls_kx_get(gnutls_session_t session);
+gnutls_mac_algorithm_t gnutls_mac_get(gnutls_session_t session);
+gnutls_compression_method_t
+gnutls_compression_get(gnutls_session_t session);
+gnutls_certificate_type_t
+gnutls_certificate_type_get(gnutls_session_t session);
+
+int gnutls_sign_algorithm_get(gnutls_session_t session);
+int gnutls_sign_algorithm_get_client(gnutls_session_t session);
+
+int gnutls_sign_algorithm_get_requested(gnutls_session_t session,
+					size_t indx,
+					gnutls_sign_algorithm_t * algo);
 
 /* the name of the specified algorithms */
-  const char *gnutls_cipher_get_name (gnutls_cipher_algorithm_t algorithm);
-  const char *gnutls_mac_get_name (gnutls_mac_algorithm_t algorithm);
-  const char *gnutls_compression_get_name (gnutls_compression_method_t
-                                           algorithm);
-  const char *gnutls_kx_get_name (gnutls_kx_algorithm_t algorithm);
-  const char *gnutls_certificate_type_get_name (gnutls_certificate_type_t
-                                                type);
-  const char *gnutls_pk_get_name (gnutls_pk_algorithm_t algorithm);
-  const char *gnutls_sign_get_name (gnutls_sign_algorithm_t algorithm);
-  
-  int gnutls_sign_is_secure (gnutls_sign_algorithm_t algorithm);
-  gnutls_digest_algorithm_t
-  gnutls_sign_get_hash_algorithm (gnutls_sign_algorithm_t sign);
-  gnutls_pk_algorithm_t
-  gnutls_sign_get_pk_algorithm (gnutls_sign_algorithm_t sign);
-  gnutls_sign_algorithm_t
-  gnutls_pk_to_sign (gnutls_pk_algorithm_t pk,
-		     gnutls_digest_algorithm_t hash);
+const char *gnutls_cipher_get_name(gnutls_cipher_algorithm_t algorithm);
+const char *gnutls_mac_get_name(gnutls_mac_algorithm_t algorithm);
+const char *gnutls_digest_get_name(gnutls_digest_algorithm_t algorithm);
+const char *gnutls_compression_get_name(gnutls_compression_method_t
+					algorithm);
+const char *gnutls_kx_get_name(gnutls_kx_algorithm_t algorithm);
+const char *gnutls_certificate_type_get_name(gnutls_certificate_type_t
+					     type);
+const char *gnutls_pk_get_name(gnutls_pk_algorithm_t algorithm);
+const char *gnutls_sign_get_name(gnutls_sign_algorithm_t algorithm);
+
+size_t gnutls_cipher_get_key_size(gnutls_cipher_algorithm_t algorithm);
+size_t gnutls_mac_get_key_size(gnutls_mac_algorithm_t algorithm);
+
+int gnutls_sign_is_secure(gnutls_sign_algorithm_t algorithm);
+gnutls_digest_algorithm_t
+gnutls_sign_get_hash_algorithm(gnutls_sign_algorithm_t sign);
+gnutls_pk_algorithm_t
+gnutls_sign_get_pk_algorithm(gnutls_sign_algorithm_t sign);
+gnutls_sign_algorithm_t
+gnutls_pk_to_sign(gnutls_pk_algorithm_t pk,
+		  gnutls_digest_algorithm_t hash);
 
 #define gnutls_sign_algorithm_get_name gnutls_sign_get_name
 
-  gnutls_mac_algorithm_t gnutls_mac_get_id (const char *name);
-  gnutls_compression_method_t gnutls_compression_get_id (const char *name);
-  gnutls_cipher_algorithm_t gnutls_cipher_get_id (const char *name);
-  gnutls_kx_algorithm_t gnutls_kx_get_id (const char *name);
-  gnutls_protocol_t gnutls_protocol_get_id (const char *name);
-  gnutls_certificate_type_t gnutls_certificate_type_get_id (const char *name);
-  gnutls_pk_algorithm_t gnutls_pk_get_id (const char *name);
-  gnutls_sign_algorithm_t gnutls_sign_get_id (const char *name);
+gnutls_mac_algorithm_t gnutls_mac_get_id(const char *name);
+gnutls_digest_algorithm_t gnutls_digest_get_id(const char *name);
+gnutls_compression_method_t gnutls_compression_get_id(const char *name);
+gnutls_cipher_algorithm_t gnutls_cipher_get_id(const char *name);
+gnutls_kx_algorithm_t gnutls_kx_get_id(const char *name);
+gnutls_protocol_t gnutls_protocol_get_id(const char *name);
+gnutls_certificate_type_t gnutls_certificate_type_get_id(const char *name);
+gnutls_pk_algorithm_t gnutls_pk_get_id(const char *name);
+gnutls_sign_algorithm_t gnutls_sign_get_id(const char *name);
 
   /* list supported algorithms */
-  const gnutls_ecc_curve_t * gnutls_ecc_curve_list (void);
-  const gnutls_cipher_algorithm_t *gnutls_cipher_list (void);
-  const gnutls_mac_algorithm_t *gnutls_mac_list (void);
-  const gnutls_compression_method_t *gnutls_compression_list (void);
-  const gnutls_protocol_t *gnutls_protocol_list (void);
-  const gnutls_certificate_type_t *gnutls_certificate_type_list (void);
-  const gnutls_kx_algorithm_t *gnutls_kx_list (void);
-  const gnutls_pk_algorithm_t *gnutls_pk_list (void);
-  const gnutls_sign_algorithm_t *gnutls_sign_list (void);
-  const char *gnutls_cipher_suite_info (size_t idx,
-                                        unsigned char *cs_id,
-                                        gnutls_kx_algorithm_t * kx,
-                                        gnutls_cipher_algorithm_t * cipher,
-                                        gnutls_mac_algorithm_t * mac,
-                                        gnutls_protocol_t * min_version);
+const gnutls_ecc_curve_t *gnutls_ecc_curve_list(void);
+const gnutls_cipher_algorithm_t *gnutls_cipher_list(void);
+const gnutls_mac_algorithm_t *gnutls_mac_list(void);
+const gnutls_digest_algorithm_t *gnutls_digest_list(void);
+const gnutls_compression_method_t *gnutls_compression_list(void);
+const gnutls_protocol_t *gnutls_protocol_list(void);
+const gnutls_certificate_type_t *gnutls_certificate_type_list(void);
+const gnutls_kx_algorithm_t *gnutls_kx_list(void);
+const gnutls_pk_algorithm_t *gnutls_pk_list(void);
+const gnutls_sign_algorithm_t *gnutls_sign_list(void);
+const char *gnutls_cipher_suite_info(size_t idx,
+				     unsigned char *cs_id,
+				     gnutls_kx_algorithm_t * kx,
+				     gnutls_cipher_algorithm_t * cipher,
+				     gnutls_mac_algorithm_t * mac,
+				     gnutls_protocol_t * min_version);
 
   /* error functions */
-  int gnutls_error_is_fatal (int error);
-  int gnutls_error_to_alert (int err, int *level);
+int gnutls_error_is_fatal(int error);
+int gnutls_error_to_alert(int err, int *level);
 
-  void gnutls_perror (int error);
-  const char *gnutls_strerror (int error);
-  const char *gnutls_strerror_name (int error);
+void gnutls_perror(int error);
+const char *gnutls_strerror(int error);
+const char *gnutls_strerror_name(int error);
 
 /* Semi-internal functions.
  */
-  void gnutls_handshake_set_private_extensions (gnutls_session_t session,
-                                                int allow);
-  int gnutls_handshake_set_random (gnutls_session_t session, const gnutls_datum_t* random);
+void gnutls_handshake_set_private_extensions(gnutls_session_t session,
+					     int allow);
+int gnutls_handshake_set_random(gnutls_session_t session,
+				const gnutls_datum_t * random);
 
-    gnutls_handshake_description_t
-    gnutls_handshake_get_last_out (gnutls_session_t session);
-    gnutls_handshake_description_t
-    gnutls_handshake_get_last_in (gnutls_session_t session);
+gnutls_handshake_description_t
+gnutls_handshake_get_last_out(gnutls_session_t session);
+gnutls_handshake_description_t
+gnutls_handshake_get_last_in(gnutls_session_t session);
 
 /* Record layer functions.
  */
 #define GNUTLS_HEARTBEAT_WAIT 1
-  int gnutls_heartbeat_ping (gnutls_session_t session, size_t data_size, 
-                       unsigned int max_tries, unsigned int flags);
-  int gnutls_heartbeat_pong (gnutls_session_t session, unsigned int flags);
+int gnutls_heartbeat_ping(gnutls_session_t session, size_t data_size,
+			  unsigned int max_tries, unsigned int flags);
+int gnutls_heartbeat_pong(gnutls_session_t session, unsigned int flags);
 
-  void gnutls_record_set_timeout (gnutls_session_t session, unsigned int ms);
-  void gnutls_record_disable_padding (gnutls_session_t session);
+void gnutls_record_set_timeout(gnutls_session_t session, unsigned int ms);
+void gnutls_record_disable_padding(gnutls_session_t session);
 
-  void gnutls_record_cork (gnutls_session_t session);
+void gnutls_record_cork(gnutls_session_t session);
 #define GNUTLS_RECORD_WAIT 1
-  int gnutls_record_uncork (gnutls_session_t session, unsigned int flags);
- 
-  typedef struct {
-    size_t low;
-    size_t high;
-  } gnutls_range_st;
-
-  int gnutls_range_split (gnutls_session_t session,
-                              const gnutls_range_st *orig,
-                              gnutls_range_st * small_range,
-                              gnutls_range_st * rem_range);
-
-  ssize_t gnutls_record_send (gnutls_session_t session, const void *data,
-                              size_t data_size);
-  ssize_t gnutls_record_send_range (gnutls_session_t session, const void *data,
-                                    size_t data_size, const gnutls_range_st *range);
-  ssize_t gnutls_record_recv (gnutls_session_t session, void *data,
-                              size_t data_size);
+int gnutls_record_uncork(gnutls_session_t session, unsigned int flags);
+
+typedef struct {
+	size_t low;
+	size_t high;
+} gnutls_range_st;
+
+int gnutls_range_split(gnutls_session_t session,
+		       const gnutls_range_st * orig,
+		       gnutls_range_st * small_range,
+		       gnutls_range_st * rem_range);
+
+ssize_t gnutls_record_send(gnutls_session_t session, const void *data,
+			   size_t data_size);
+ssize_t gnutls_record_send_range(gnutls_session_t session,
+				 const void *data, size_t data_size,
+				 const gnutls_range_st * range);
+ssize_t gnutls_record_recv(gnutls_session_t session, void *data,
+			   size_t data_size);
 #define gnutls_read gnutls_record_recv
 #define gnutls_write gnutls_record_send
-  ssize_t gnutls_record_recv_seq (gnutls_session_t session, void *data, size_t data_size,
-    unsigned char *seq);
+ssize_t gnutls_record_recv_seq(gnutls_session_t session, void *data,
+			       size_t data_size, unsigned char *seq);
+
+size_t gnutls_record_overhead_size(gnutls_session_t session);
+
+size_t gnutls_est_record_overhead_size(gnutls_protocol_t version,
+				       gnutls_cipher_algorithm_t cipher,
+				       gnutls_mac_algorithm_t mac,
+				       gnutls_compression_method_t comp,
+				       unsigned int flags);
 
-  void gnutls_session_enable_compatibility_mode (gnutls_session_t session);
-  void gnutls_record_set_max_empty_records (gnutls_session_t session, const unsigned int i);
+void gnutls_session_enable_compatibility_mode(gnutls_session_t session);
+void gnutls_record_set_max_empty_records(gnutls_session_t session,
+					 const unsigned int i);
 
-  int gnutls_record_can_use_length_hiding (gnutls_session_t session);
+int gnutls_record_can_use_length_hiding(gnutls_session_t session);
 
-  int gnutls_record_get_direction (gnutls_session_t session);
+int gnutls_record_get_direction(gnutls_session_t session);
 
-  size_t gnutls_record_get_max_size (gnutls_session_t session);
-  ssize_t gnutls_record_set_max_size (gnutls_session_t session, size_t size);
+size_t gnutls_record_get_max_size(gnutls_session_t session);
+ssize_t gnutls_record_set_max_size(gnutls_session_t session, size_t size);
 
-  size_t gnutls_record_check_pending (gnutls_session_t session);
+size_t gnutls_record_check_pending(gnutls_session_t session);
 
-  void gnutls_session_force_valid (gnutls_session_t session);
+void gnutls_session_force_valid(gnutls_session_t session);
 
-  int gnutls_prf (gnutls_session_t session,
-                  size_t label_size, const char *label,
-                  int server_random_first,
-                  size_t extra_size, const char *extra,
-                  size_t outsize, char *out);
+int gnutls_prf(gnutls_session_t session,
+	       size_t label_size, const char *label,
+	       int server_random_first,
+	       size_t extra_size, const char *extra,
+	       size_t outsize, char *out);
 
-  int gnutls_prf_raw (gnutls_session_t session,
-                      size_t label_size, const char *label,
-                      size_t seed_size, const char *seed,
-                      size_t outsize, char *out);
+int gnutls_prf_raw(gnutls_session_t session,
+		   size_t label_size, const char *label,
+		   size_t seed_size, const char *seed,
+		   size_t outsize, char *out);
 
 /**
  * gnutls_server_name_type_t:
@@ -951,34 +971,34 @@ gnutls_ecc_curve_t gnutls_ecc_curve_get(gnutls_session_t session);
  *
  * Enumeration of different server name types.
  */
-  typedef enum
-  {
-    GNUTLS_NAME_DNS = 1
-  } gnutls_server_name_type_t;
+typedef enum {
+	GNUTLS_NAME_DNS = 1
+} gnutls_server_name_type_t;
 
-  int gnutls_server_name_set (gnutls_session_t session,
-                              gnutls_server_name_type_t type,
-                              const void *name, size_t name_length);
+int gnutls_server_name_set(gnutls_session_t session,
+			   gnutls_server_name_type_t type,
+			   const void *name, size_t name_length);
 
-  int gnutls_server_name_get (gnutls_session_t session,
-                              void *data, size_t * data_length,
-                              unsigned int *type, unsigned int indx);
+int gnutls_server_name_get(gnutls_session_t session,
+			   void *data, size_t * data_length,
+			   unsigned int *type, unsigned int indx);
 
-  unsigned int gnutls_heartbeat_get_timeout (gnutls_session_t session);
-  void gnutls_heartbeat_set_timeouts (gnutls_session_t session, unsigned int retrans_timeout,
-                                      unsigned int total_timeout);
+unsigned int gnutls_heartbeat_get_timeout(gnutls_session_t session);
+void gnutls_heartbeat_set_timeouts(gnutls_session_t session,
+				   unsigned int retrans_timeout,
+				   unsigned int total_timeout);
 
 #define GNUTLS_HB_PEER_ALLOWED_TO_SEND (1)
 #define GNUTLS_HB_PEER_NOT_ALLOWED_TO_SEND (1<<1)
 
   /* Heartbeat */
-  void gnutls_heartbeat_enable (gnutls_session_t session, unsigned int type);
+void gnutls_heartbeat_enable(gnutls_session_t session, unsigned int type);
 
 #define GNUTLS_HB_LOCAL_ALLOWED_TO_SEND (1<<2)
-  int gnutls_heartbeat_allowed (gnutls_session_t session, unsigned int type);
+int gnutls_heartbeat_allowed(gnutls_session_t session, unsigned int type);
 
   /* Safe renegotiation */
-  int gnutls_safe_renegotiation_status (gnutls_session_t session);
+int gnutls_safe_renegotiation_status(gnutls_session_t session);
 
 /**
  * gnutls_supplemental_data_format_type_t:
@@ -986,20 +1006,18 @@ gnutls_ecc_curve_t gnutls_ecc_curve_get(gnutls_session_t session);
  *
  * Enumeration of different supplemental data types (RFC 4680).
  */
-  typedef enum
-  {
-    GNUTLS_SUPPLEMENTAL_USER_MAPPING_DATA = 0
-  } gnutls_supplemental_data_format_type_t;
+typedef enum {
+	GNUTLS_SUPPLEMENTAL_USER_MAPPING_DATA = 0
+} gnutls_supplemental_data_format_type_t;
 
-  const char
-    *gnutls_supplemental_get_name (gnutls_supplemental_data_format_type_t
-                                   type);
+const char
+*gnutls_supplemental_get_name(gnutls_supplemental_data_format_type_t type);
 
   /* SessionTicket, RFC 5077. */
-  int gnutls_session_ticket_key_generate (gnutls_datum_t * key);
-  int gnutls_session_ticket_enable_client (gnutls_session_t session);
-  int gnutls_session_ticket_enable_server (gnutls_session_t session,
-                                           const gnutls_datum_t * key);
+int gnutls_session_ticket_key_generate(gnutls_datum_t * key);
+int gnutls_session_ticket_enable_client(gnutls_session_t session);
+int gnutls_session_ticket_enable_server(gnutls_session_t session,
+					const gnutls_datum_t * key);
 
   /* SRTP, RFC 5764 */
 
@@ -1012,324 +1030,399 @@ gnutls_ecc_curve_t gnutls_ecc_curve_get(gnutls_session_t session);
  *
  * Enumeration of different SRTP protection profiles.
  */
-  typedef enum
-  {
-    GNUTLS_SRTP_AES128_CM_HMAC_SHA1_80 = 0x0001,
-    GNUTLS_SRTP_AES128_CM_HMAC_SHA1_32 = 0x0002,
-    GNUTLS_SRTP_NULL_HMAC_SHA1_80      = 0x0005,
-    GNUTLS_SRTP_NULL_HMAC_SHA1_32      = 0x0006
-  } gnutls_srtp_profile_t;
-
-  int gnutls_srtp_set_profile (gnutls_session_t session,
-                               gnutls_srtp_profile_t profile);
-  int gnutls_srtp_set_profile_direct (gnutls_session_t session,
-                                      const char *profiles, const char **err_pos);
-  int gnutls_srtp_get_selected_profile (gnutls_session_t session,
-                                        gnutls_srtp_profile_t *profile);
-
-  const char *gnutls_srtp_get_profile_name (gnutls_srtp_profile_t profile);
-  int gnutls_srtp_get_profile_id (const char *name,
-                                  gnutls_srtp_profile_t *profile);
-  int gnutls_srtp_get_keys (gnutls_session_t session, 
-                      void *key_material,
-                      unsigned int key_material_size,
-                      gnutls_datum_t *client_key, 
-                      gnutls_datum_t *client_salt,
-                      gnutls_datum_t *server_key, 
-                      gnutls_datum_t *server_salt);
-
-  int gnutls_srtp_set_mki (gnutls_session_t session, const gnutls_datum_t *mki);
-  int gnutls_srtp_get_mki (gnutls_session_t session, gnutls_datum_t *mki);
-
-  int gnutls_key_generate (gnutls_datum_t * key, unsigned int key_size);
+typedef enum {
+	GNUTLS_SRTP_AES128_CM_HMAC_SHA1_80 = 0x0001,
+	GNUTLS_SRTP_AES128_CM_HMAC_SHA1_32 = 0x0002,
+	GNUTLS_SRTP_NULL_HMAC_SHA1_80 = 0x0005,
+	GNUTLS_SRTP_NULL_HMAC_SHA1_32 = 0x0006
+} gnutls_srtp_profile_t;
+
+int gnutls_srtp_set_profile(gnutls_session_t session,
+			    gnutls_srtp_profile_t profile);
+int gnutls_srtp_set_profile_direct(gnutls_session_t session,
+				   const char *profiles,
+				   const char **err_pos);
+int gnutls_srtp_get_selected_profile(gnutls_session_t session,
+				     gnutls_srtp_profile_t * profile);
+
+const char *gnutls_srtp_get_profile_name(gnutls_srtp_profile_t profile);
+int gnutls_srtp_get_profile_id(const char *name,
+			       gnutls_srtp_profile_t * profile);
+int gnutls_srtp_get_keys(gnutls_session_t session,
+			 void *key_material,
+			 unsigned int key_material_size,
+			 gnutls_datum_t * client_key,
+			 gnutls_datum_t * client_salt,
+			 gnutls_datum_t * server_key,
+			 gnutls_datum_t * server_salt);
+
+int gnutls_srtp_set_mki(gnutls_session_t session,
+			const gnutls_datum_t * mki);
+int gnutls_srtp_get_mki(gnutls_session_t session, gnutls_datum_t * mki);
+
+/* ALPN TLS extension */
+#define GNUTLS_ALPN_MAND 1
+int gnutls_alpn_get_selected_protocol(gnutls_session_t session,
+				      gnutls_datum_t * protocol);
+int gnutls_alpn_set_protocols(gnutls_session_t session,
+			      const gnutls_datum_t * protocols,
+			      unsigned protocols_size, unsigned flags);
+
+int gnutls_key_generate(gnutls_datum_t * key, unsigned int key_size);
 
 /* if you just want some defaults, use the following.
  */
-  int gnutls_priority_init (gnutls_priority_t * priority_cache,
-                            const char *priorities, const char **err_pos);
-  void gnutls_priority_deinit (gnutls_priority_t priority_cache);
-  int gnutls_priority_get_cipher_suite_index (gnutls_priority_t pcache, unsigned int idx, unsigned int *sidx);
-
-  int gnutls_priority_set (gnutls_session_t session,
-                           gnutls_priority_t priority);
-  int gnutls_priority_set_direct (gnutls_session_t session,
-                                  const char *priorities,
-                                  const char **err_pos);
-
-  int gnutls_priority_certificate_type_list (gnutls_priority_t pcache, const unsigned int** list);
-  int gnutls_priority_sign_list (gnutls_priority_t pcache, const unsigned int** list);
-  int gnutls_priority_protocol_list (gnutls_priority_t pcache, const unsigned int** list);
-  int gnutls_priority_compression_list (gnutls_priority_t pcache, const unsigned int** list);
-  int gnutls_priority_ecc_curve_list (gnutls_priority_t pcache, const unsigned int** list);
+int gnutls_priority_init(gnutls_priority_t * priority_cache,
+			 const char *priorities, const char **err_pos);
+void gnutls_priority_deinit(gnutls_priority_t priority_cache);
+int gnutls_priority_get_cipher_suite_index(gnutls_priority_t pcache,
+					   unsigned int idx,
+					   unsigned int *sidx);
+
+int gnutls_priority_set(gnutls_session_t session,
+			gnutls_priority_t priority);
+int gnutls_priority_set_direct(gnutls_session_t session,
+			       const char *priorities,
+			       const char **err_pos);
+
+int gnutls_priority_certificate_type_list(gnutls_priority_t pcache,
+					  const unsigned int **list);
+int gnutls_priority_sign_list(gnutls_priority_t pcache,
+			      const unsigned int **list);
+int gnutls_priority_protocol_list(gnutls_priority_t pcache,
+				  const unsigned int **list);
+int gnutls_priority_compression_list(gnutls_priority_t pcache,
+				     const unsigned int **list);
+int gnutls_priority_ecc_curve_list(gnutls_priority_t pcache,
+				   const unsigned int **list);
+
+int gnutls_priority_kx_list(gnutls_priority_t pcache,
+			    const unsigned int **list);
+int gnutls_priority_cipher_list(gnutls_priority_t pcache,
+				const unsigned int **list);
+int gnutls_priority_mac_list(gnutls_priority_t pcache,
+			     const unsigned int **list);
 
   /* for compatibility
    */
-  int gnutls_set_default_priority (gnutls_session_t session);
+int gnutls_set_default_priority(gnutls_session_t session);
 
 /* Returns the name of a cipher suite */
-  const char *gnutls_cipher_suite_get_name (gnutls_kx_algorithm_t
-                                            kx_algorithm,
-                                            gnutls_cipher_algorithm_t
-                                            cipher_algorithm,
-                                            gnutls_mac_algorithm_t
-                                            mac_algorithm);
+const char *gnutls_cipher_suite_get_name(gnutls_kx_algorithm_t
+					 kx_algorithm,
+					 gnutls_cipher_algorithm_t
+					 cipher_algorithm,
+					 gnutls_mac_algorithm_t
+					 mac_algorithm);
 
 /* get the currently used protocol version */
-  gnutls_protocol_t gnutls_protocol_get_version (gnutls_session_t session);
+gnutls_protocol_t gnutls_protocol_get_version(gnutls_session_t session);
 
-  const char *gnutls_protocol_get_name (gnutls_protocol_t version);
+const char *gnutls_protocol_get_name(gnutls_protocol_t version);
 
 
 /* get/set session 
  */
-  int gnutls_session_set_data (gnutls_session_t session,
-                               const void *session_data,
-                               size_t session_data_size);
-  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_t * data);
-  void gnutls_session_get_random (gnutls_session_t session, gnutls_datum_t* client, 
-                                  gnutls_datum_t* server);
-  char * gnutls_session_get_desc (gnutls_session_t session);
-
-  int gnutls_session_set_premaster (gnutls_session_t session, unsigned int entity,
-                           gnutls_protocol_t version, 
-                           gnutls_kx_algorithm_t kx, 
-                           gnutls_cipher_algorithm_t cipher,
-                           gnutls_mac_algorithm_t mac,
-                           gnutls_compression_method_t comp,
-                           const gnutls_datum_t* master,
-                           const gnutls_datum_t * session_id);
+int gnutls_session_set_data(gnutls_session_t session,
+			    const void *session_data,
+			    size_t session_data_size);
+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_t * data);
+void gnutls_session_get_random(gnutls_session_t session,
+			       gnutls_datum_t * client,
+			       gnutls_datum_t * server);
+char *gnutls_session_get_desc(gnutls_session_t session);
+
+int gnutls_session_set_premaster(gnutls_session_t session,
+				 unsigned int entity,
+				 gnutls_protocol_t version,
+				 gnutls_kx_algorithm_t kx,
+				 gnutls_cipher_algorithm_t cipher,
+				 gnutls_mac_algorithm_t mac,
+				 gnutls_compression_method_t comp,
+				 const gnutls_datum_t * master,
+				 const gnutls_datum_t * session_id);
 
 /* returns the session ID */
 #define GNUTLS_MAX_SESSION_ID 32
-  int gnutls_session_get_id (gnutls_session_t session, void *session_id,
-                             size_t * session_id_size);
-  int gnutls_session_get_id2 (gnutls_session_t session, gnutls_datum_t *session_id);
+int gnutls_session_get_id(gnutls_session_t session, void *session_id,
+			  size_t * session_id_size);
+int gnutls_session_get_id2(gnutls_session_t session,
+			   gnutls_datum_t * session_id);
 
-  int gnutls_session_channel_binding (gnutls_session_t session,
-                                      gnutls_channel_binding_t cbtype,
-                                      gnutls_datum_t * cb);
+int gnutls_session_set_id(gnutls_session_t session,
+			  const gnutls_datum_t * sid);
+
+int gnutls_session_channel_binding(gnutls_session_t session,
+				   gnutls_channel_binding_t cbtype,
+				   gnutls_datum_t * cb);
 
 /* checks if this session is a resumed one 
  */
-  int gnutls_session_is_resumed (gnutls_session_t session);
-  int gnutls_session_resumption_requested (gnutls_session_t session);
-
-  typedef int (*gnutls_db_store_func) (void *, gnutls_datum_t key,
-                                       gnutls_datum_t data);
-  typedef int (*gnutls_db_remove_func) (void *, gnutls_datum_t key);
-  typedef gnutls_datum_t (*gnutls_db_retr_func) (void *, gnutls_datum_t key);
-
-  void gnutls_db_set_cache_expiration (gnutls_session_t session, int seconds);
-
-  void gnutls_db_remove_session (gnutls_session_t session);
-  void gnutls_db_set_retrieve_function (gnutls_session_t session,
-                                        gnutls_db_retr_func retr_func);
-  void gnutls_db_set_remove_function (gnutls_session_t session,
-                                      gnutls_db_remove_func rem_func);
-  void gnutls_db_set_store_function (gnutls_session_t session,
-                                     gnutls_db_store_func store_func);
-  void gnutls_db_set_ptr (gnutls_session_t session, void *ptr);
-  void *gnutls_db_get_ptr (gnutls_session_t session);
-  int gnutls_db_check_entry (gnutls_session_t session,
-                             gnutls_datum_t session_entry);
-  time_t gnutls_db_check_entry_time (gnutls_datum_t *entry);
-
-  typedef int (*gnutls_handshake_post_client_hello_func) (gnutls_session_t);
-  void
-    gnutls_handshake_set_post_client_hello_function (gnutls_session_t session,
-                                                     gnutls_handshake_post_client_hello_func
-                                                     func);
-
-  void gnutls_handshake_set_max_packet_length (gnutls_session_t session,
-                                               size_t max);
+int gnutls_session_is_resumed(gnutls_session_t session);
+int gnutls_session_resumption_requested(gnutls_session_t session);
+
+typedef int (*gnutls_db_store_func) (void *, gnutls_datum_t key,
+				     gnutls_datum_t data);
+typedef int (*gnutls_db_remove_func) (void *, gnutls_datum_t key);
+typedef gnutls_datum_t(*gnutls_db_retr_func) (void *, gnutls_datum_t key);
+
+void gnutls_db_set_cache_expiration(gnutls_session_t session, int seconds);
+
+void gnutls_db_remove_session(gnutls_session_t session);
+void gnutls_db_set_retrieve_function(gnutls_session_t session,
+				     gnutls_db_retr_func retr_func);
+void gnutls_db_set_remove_function(gnutls_session_t session,
+				   gnutls_db_remove_func rem_func);
+void gnutls_db_set_store_function(gnutls_session_t session,
+				  gnutls_db_store_func store_func);
+void gnutls_db_set_ptr(gnutls_session_t session, void *ptr);
+void *gnutls_db_get_ptr(gnutls_session_t session);
+int gnutls_db_check_entry(gnutls_session_t session,
+			  gnutls_datum_t session_entry);
+time_t gnutls_db_check_entry_time(gnutls_datum_t * entry);
+
+  /**
+   * gnutls_handshake_hook_func:
+   * @session: the current session
+   * @htype: the type of the handshake message (%gnutls_handshake_description_t)
+   * @post: non zero if this is a post-process/generation call and zero otherwise
+   * @incoming: non zero if this is an incoming message and zero if this is an outgoing message
+   *
+   * Function prototype for handshake hooks. It is set using
+   * gnutls_handshake_set_hook_function().
+   *
+   * Returns: Non zero on error.
+   */
+#define GNUTLS_HOOK_POST (1)
+#define GNUTLS_HOOK_PRE (0)
+#define GNUTLS_HOOK_BOTH (-1)
+
+typedef int (*gnutls_handshake_hook_func) (gnutls_session_t,
+					   unsigned int htype,
+					   unsigned post,
+					   unsigned int incoming);
+void gnutls_handshake_set_hook_function(gnutls_session_t session,
+					unsigned int htype, int post,
+					gnutls_handshake_hook_func func);
+
+typedef int (*gnutls_handshake_post_client_hello_func) (gnutls_session_t);
+void
+gnutls_handshake_set_post_client_hello_function(gnutls_session_t session,
+						gnutls_handshake_post_client_hello_func
+						func);
+
+void gnutls_handshake_set_max_packet_length(gnutls_session_t session,
+					    size_t max);
 
 /* returns libgnutls version (call it with a NULL argument)
  */
-  const char *gnutls_check_version (const char *req_version);
+const char *gnutls_check_version(const char *req_version);
 
 /* Functions for setting/clearing credentials
  */
-  void gnutls_credentials_clear (gnutls_session_t session);
+void gnutls_credentials_clear(gnutls_session_t session);
 
 /* cred is a structure defined by the kx algorithm
  */
-  int gnutls_credentials_set (gnutls_session_t session,
-                              gnutls_credentials_type_t type, void *cred);
+int gnutls_credentials_set(gnutls_session_t session,
+			   gnutls_credentials_type_t type, void *cred);
 #define gnutls_cred_set	gnutls_credentials_set
 
 /* x.509 types */
 
-  struct gnutls_x509_privkey_int;
-  typedef struct gnutls_x509_privkey_int *gnutls_x509_privkey_t;
+struct gnutls_pubkey_st;
+typedef struct gnutls_pubkey_st *gnutls_pubkey_t;
 
-  struct gnutls_x509_crl_int;
-  typedef struct gnutls_x509_crl_int *gnutls_x509_crl_t;
+struct gnutls_privkey_st;
+typedef struct gnutls_privkey_st *gnutls_privkey_t;
 
-  struct gnutls_x509_crt_int;
-  typedef struct gnutls_x509_crt_int *gnutls_x509_crt_t;
+struct gnutls_x509_privkey_int;
+typedef struct gnutls_x509_privkey_int *gnutls_x509_privkey_t;
 
-  struct gnutls_x509_crq_int;
-  typedef struct gnutls_x509_crq_int *gnutls_x509_crq_t;
+struct gnutls_x509_crl_int;
+typedef struct gnutls_x509_crl_int *gnutls_x509_crl_t;
 
-  struct gnutls_openpgp_keyring_int;
-  typedef struct gnutls_openpgp_keyring_int *gnutls_openpgp_keyring_t;
+struct gnutls_x509_crt_int;
+typedef struct gnutls_x509_crt_int *gnutls_x509_crt_t;
+
+struct gnutls_x509_crq_int;
+typedef struct gnutls_x509_crq_int *gnutls_x509_crq_t;
+
+struct gnutls_openpgp_keyring_int;
+typedef struct gnutls_openpgp_keyring_int *gnutls_openpgp_keyring_t;
 
 
 /* Credential structures - used in gnutls_credentials_set(); */
 
-  struct gnutls_certificate_credentials_st;
-  typedef struct gnutls_certificate_credentials_st
-    *gnutls_certificate_credentials_t;
-  typedef gnutls_certificate_credentials_t
+struct gnutls_certificate_credentials_st;
+typedef struct gnutls_certificate_credentials_st
+*gnutls_certificate_credentials_t;
+typedef gnutls_certificate_credentials_t
     gnutls_certificate_server_credentials;
-  typedef gnutls_certificate_credentials_t
+typedef gnutls_certificate_credentials_t
     gnutls_certificate_client_credentials;
 
-  typedef struct gnutls_anon_server_credentials_st
-    *gnutls_anon_server_credentials_t;
-  typedef struct gnutls_anon_client_credentials_st
-    *gnutls_anon_client_credentials_t;
+typedef struct gnutls_anon_server_credentials_st
+*gnutls_anon_server_credentials_t;
+typedef struct gnutls_anon_client_credentials_st
+*gnutls_anon_client_credentials_t;
 
-  void gnutls_anon_free_server_credentials (gnutls_anon_server_credentials_t
-                                            sc);
-  int
-    gnutls_anon_allocate_server_credentials (gnutls_anon_server_credentials_t
-                                             * sc);
+void gnutls_anon_free_server_credentials(gnutls_anon_server_credentials_t
+					 sc);
+int
+gnutls_anon_allocate_server_credentials(gnutls_anon_server_credentials_t
+					* sc);
 
-  void gnutls_anon_set_server_dh_params (gnutls_anon_server_credentials_t res,
-                                         gnutls_dh_params_t dh_params);
+void gnutls_anon_set_server_dh_params(gnutls_anon_server_credentials_t res,
+				      gnutls_dh_params_t dh_params);
 
-  void
-    gnutls_anon_set_server_params_function (gnutls_anon_server_credentials_t
-                                            res,
-                                            gnutls_params_function * func);
+void
+gnutls_anon_set_server_params_function(gnutls_anon_server_credentials_t
+				       res, gnutls_params_function * func);
 
-  void
-    gnutls_anon_free_client_credentials (gnutls_anon_client_credentials_t sc);
-  int
-    gnutls_anon_allocate_client_credentials (gnutls_anon_client_credentials_t
-                                             * sc);
+void
+gnutls_anon_free_client_credentials(gnutls_anon_client_credentials_t sc);
+int
+gnutls_anon_allocate_client_credentials(gnutls_anon_client_credentials_t
+					* sc);
 
 /* CERTFILE is an x509 certificate in PEM form.
  * KEYFILE is a pkcs-1 private key in PEM form (for RSA keys).
  */
-  void
-    gnutls_certificate_free_credentials (gnutls_certificate_credentials_t sc);
-  int
-    gnutls_certificate_allocate_credentials (gnutls_certificate_credentials_t
-                                             * res);
-
-  int
-    gnutls_certificate_get_issuer (gnutls_certificate_credentials_t sc,
-    gnutls_x509_crt_t cert, gnutls_x509_crt_t* issuer, unsigned int flags);
-
-  void gnutls_certificate_free_keys (gnutls_certificate_credentials_t sc);
-  void gnutls_certificate_free_cas (gnutls_certificate_credentials_t sc);
-  void gnutls_certificate_free_ca_names (gnutls_certificate_credentials_t sc);
-  void gnutls_certificate_free_crls (gnutls_certificate_credentials_t sc);
-
-  void gnutls_certificate_set_dh_params (gnutls_certificate_credentials_t res,
-                                         gnutls_dh_params_t dh_params);
-  void gnutls_certificate_set_verify_flags (gnutls_certificate_credentials_t
-                                            res, unsigned int flags);
-  void gnutls_certificate_set_verify_limits (gnutls_certificate_credentials_t
-                                             res, unsigned int max_bits,
-                                             unsigned int max_depth);
-
-  int
-    gnutls_certificate_set_x509_system_trust (gnutls_certificate_credentials_t cred);
-
-  int
-    gnutls_certificate_set_x509_trust_file (gnutls_certificate_credentials_t
-                                            cred, const char *cafile,
-                                            gnutls_x509_crt_fmt_t type);
-  int gnutls_certificate_set_x509_trust_mem (gnutls_certificate_credentials_t
-                                             res, const gnutls_datum_t * ca,
-                                             gnutls_x509_crt_fmt_t type);
-
-  int
-    gnutls_certificate_set_x509_crl_file (gnutls_certificate_credentials_t
-                                          res, const char *crlfile,
-                                          gnutls_x509_crt_fmt_t type);
-  int gnutls_certificate_set_x509_crl_mem (gnutls_certificate_credentials_t
-                                           res, const gnutls_datum_t * CRL,
-                                           gnutls_x509_crt_fmt_t type);
-
-  int
-    gnutls_certificate_set_x509_key_file (gnutls_certificate_credentials_t
-                                          res, const char *certfile,
-                                          const char *keyfile,
-                                          gnutls_x509_crt_fmt_t type);
-
-  int
-    gnutls_certificate_set_x509_key_file2 (gnutls_certificate_credentials_t
-                                          res, const char *certfile,
-                                          const char *keyfile,
-                                          gnutls_x509_crt_fmt_t type,
-                                          const char* pass,
-                                          unsigned int flags);
-
-  int gnutls_certificate_set_x509_key_mem (gnutls_certificate_credentials_t
-                                           res, const gnutls_datum_t * cert,
-                                           const gnutls_datum_t * key,
-                                           gnutls_x509_crt_fmt_t type);
-
-  int gnutls_certificate_set_x509_key_mem2 (gnutls_certificate_credentials_t
-                                           res, const gnutls_datum_t * cert,
-                                           const gnutls_datum_t * key,
-                                           gnutls_x509_crt_fmt_t type,
-                                           const char* pass,
-                                           unsigned int flags);
-
-  void gnutls_certificate_send_x509_rdn_sequence (gnutls_session_t session,
-                                                  int status);
-
-  int gnutls_certificate_set_x509_simple_pkcs12_file (gnutls_certificate_credentials_t res, const char *pkcs12file,
-     gnutls_x509_crt_fmt_t type, const char *password);
-  int gnutls_certificate_set_x509_simple_pkcs12_mem (gnutls_certificate_credentials_t res, const gnutls_datum_t * p12blob,
-     gnutls_x509_crt_fmt_t type, const char *password);
+void
+gnutls_certificate_free_credentials(gnutls_certificate_credentials_t sc);
+int
+gnutls_certificate_allocate_credentials(gnutls_certificate_credentials_t
+					* res);
+
+int
+gnutls_certificate_get_issuer(gnutls_certificate_credentials_t sc,
+			      gnutls_x509_crt_t cert,
+			      gnutls_x509_crt_t * issuer,
+			      unsigned int flags);
+
+int gnutls_certificate_get_crt_raw(gnutls_certificate_credentials_t sc,
+				   unsigned idx1, unsigned idx2,
+				   gnutls_datum_t * cert);
+
+void gnutls_certificate_free_keys(gnutls_certificate_credentials_t sc);
+void gnutls_certificate_free_cas(gnutls_certificate_credentials_t sc);
+void gnutls_certificate_free_ca_names(gnutls_certificate_credentials_t sc);
+void gnutls_certificate_free_crls(gnutls_certificate_credentials_t sc);
+
+void gnutls_certificate_set_dh_params(gnutls_certificate_credentials_t res,
+				      gnutls_dh_params_t dh_params);
+void gnutls_certificate_set_verify_flags(gnutls_certificate_credentials_t
+					 res, unsigned int flags);
+void gnutls_certificate_set_verify_limits(gnutls_certificate_credentials_t
+					  res, unsigned int max_bits,
+					  unsigned int max_depth);
+
+int
+gnutls_certificate_set_x509_system_trust(gnutls_certificate_credentials_t
+					 cred);
+
+int
+gnutls_certificate_set_x509_trust_file(gnutls_certificate_credentials_t
+				       cred, const char *cafile,
+				       gnutls_x509_crt_fmt_t type);
+int gnutls_certificate_set_x509_trust_mem(gnutls_certificate_credentials_t
+					  res, const gnutls_datum_t * ca,
+					  gnutls_x509_crt_fmt_t type);
+
+int
+gnutls_certificate_set_x509_crl_file(gnutls_certificate_credentials_t
+				     res, const char *crlfile,
+				     gnutls_x509_crt_fmt_t type);
+int gnutls_certificate_set_x509_crl_mem(gnutls_certificate_credentials_t
+					res, const gnutls_datum_t * CRL,
+					gnutls_x509_crt_fmt_t type);
+
+int
+gnutls_certificate_set_x509_key_file(gnutls_certificate_credentials_t
+				     res, const char *certfile,
+				     const char *keyfile,
+				     gnutls_x509_crt_fmt_t type);
+
+int
+gnutls_certificate_set_x509_key_file2(gnutls_certificate_credentials_t
+				      res, const char *certfile,
+				      const char *keyfile,
+				      gnutls_x509_crt_fmt_t type,
+				      const char *pass,
+				      unsigned int flags);
+
+int gnutls_certificate_set_x509_key_mem(gnutls_certificate_credentials_t
+					res, const gnutls_datum_t * cert,
+					const gnutls_datum_t * key,
+					gnutls_x509_crt_fmt_t type);
+
+int gnutls_certificate_set_x509_key_mem2(gnutls_certificate_credentials_t
+					 res, const gnutls_datum_t * cert,
+					 const gnutls_datum_t * key,
+					 gnutls_x509_crt_fmt_t type,
+					 const char *pass,
+					 unsigned int flags);
+
+void gnutls_certificate_send_x509_rdn_sequence(gnutls_session_t session,
+					       int status);
+
+int
+gnutls_certificate_set_x509_simple_pkcs12_file
+(gnutls_certificate_credentials_t res, const char *pkcs12file,
+ gnutls_x509_crt_fmt_t type, const char *password);
+int
+gnutls_certificate_set_x509_simple_pkcs12_mem
+(gnutls_certificate_credentials_t res, const gnutls_datum_t * p12blob,
+ gnutls_x509_crt_fmt_t type, const char *password);
 
 /* New functions to allow setting already parsed X.509 stuff.
  */
 
-  int gnutls_certificate_set_x509_key (gnutls_certificate_credentials_t res,
-                                       gnutls_x509_crt_t * cert_list,
-                                       int cert_list_size,
-                                       gnutls_x509_privkey_t key);
-  int gnutls_certificate_set_x509_trust (gnutls_certificate_credentials_t res,
-                                         gnutls_x509_crt_t * ca_list,
-                                         int ca_list_size);
-  int gnutls_certificate_set_x509_crl (gnutls_certificate_credentials_t res,
-                                       gnutls_x509_crl_t * crl_list,
-                                       int crl_list_size);
+int gnutls_certificate_set_x509_key(gnutls_certificate_credentials_t res,
+				    gnutls_x509_crt_t * cert_list,
+				    int cert_list_size,
+				    gnutls_x509_privkey_t key);
+int gnutls_certificate_set_x509_trust(gnutls_certificate_credentials_t res,
+				      gnutls_x509_crt_t * ca_list,
+				      int ca_list_size);
+int gnutls_certificate_set_x509_crl(gnutls_certificate_credentials_t res,
+				    gnutls_x509_crl_t * crl_list,
+				    int crl_list_size);
 
   /* OCSP status request extension, RFC 6066 */
-  typedef int (*gnutls_status_request_ocsp_func)
-  (gnutls_session_t session, void *ptr, gnutls_datum_t *ocsp_response);
+typedef int (*gnutls_status_request_ocsp_func)
+ (gnutls_session_t session, void *ptr, gnutls_datum_t * ocsp_response);
 
-  void gnutls_certificate_set_ocsp_status_request_function (gnutls_certificate_credentials_t res,
-                                                           gnutls_status_request_ocsp_func ocsp_func,
-                                                           void *ptr);
+void
+gnutls_certificate_set_ocsp_status_request_function
+(gnutls_certificate_credentials_t res,
+gnutls_status_request_ocsp_func ocsp_func, void *ptr);
 
-  int gnutls_certificate_set_ocsp_status_request_file (gnutls_certificate_credentials_t res,
-                                                       const char* response_file, unsigned int flags);
+int
+gnutls_certificate_set_ocsp_status_request_file
+(gnutls_certificate_credentials_t res, const char *response_file,
+ unsigned int flags);
 
-  int gnutls_ocsp_status_request_enable_client (gnutls_session_t session,
-					        gnutls_datum_t *responder_id,
-                                                size_t responder_id_size,
-					        gnutls_datum_t *request_extensions);
+int gnutls_ocsp_status_request_enable_client(gnutls_session_t session,
+					     gnutls_datum_t * responder_id,
+					     size_t responder_id_size,
+					     gnutls_datum_t *
+					     request_extensions);
 
-  int gnutls_ocsp_status_request_get (gnutls_session_t session, gnutls_datum_t *response);
+int gnutls_ocsp_status_request_get(gnutls_session_t session,
+				   gnutls_datum_t * response);
 
-  int gnutls_ocsp_status_request_is_checked (gnutls_session_t session, unsigned int flags);
+int gnutls_ocsp_status_request_is_checked(gnutls_session_t session,
+					  unsigned int flags);
 
 /* global state functions
  */
-  int gnutls_global_init (void);
-  void gnutls_global_deinit (void);
+int gnutls_global_init(void);
+void gnutls_global_deinit(void);
 
   /**
    * gnutls_time_func:
@@ -1340,141 +1433,146 @@ gnutls_ecc_curve_t gnutls_ecc_curve_get(gnutls_session_t session);
    *
    * Returns: Number of seconds since the epoch, or (time_t)-1 on errors.
    */
-  typedef time_t (*gnutls_time_func) (time_t *t);
+typedef time_t(*gnutls_time_func) (time_t * t);
 
-  typedef int (*mutex_init_func) (void **mutex);
-  typedef int (*mutex_lock_func) (void **mutex);
-  typedef int (*mutex_unlock_func) (void **mutex);
-  typedef int (*mutex_deinit_func) (void **mutex);
+typedef int (*mutex_init_func) (void **mutex);
+typedef int (*mutex_lock_func) (void **mutex);
+typedef int (*mutex_unlock_func) (void **mutex);
+typedef int (*mutex_deinit_func) (void **mutex);
 
-  void gnutls_global_set_mutex (mutex_init_func init, mutex_deinit_func deinit,
-                                mutex_lock_func lock, mutex_unlock_func unlock);
+void gnutls_global_set_mutex(mutex_init_func init,
+			     mutex_deinit_func deinit,
+			     mutex_lock_func lock,
+			     mutex_unlock_func unlock);
 
-  typedef void *(*gnutls_alloc_function) (size_t);
-  typedef void *(*gnutls_calloc_function) (size_t, size_t);
-  typedef int (*gnutls_is_secure_function) (const void *);
-  typedef void (*gnutls_free_function) (void *);
-  typedef void *(*gnutls_realloc_function) (void *, size_t);
+typedef void *(*gnutls_alloc_function) (size_t);
+typedef void *(*gnutls_calloc_function) (size_t, size_t);
+typedef int (*gnutls_is_secure_function) (const void *);
+typedef void (*gnutls_free_function) (void *);
+typedef void *(*gnutls_realloc_function) (void *, size_t);
 
-  void
-    gnutls_global_set_mem_functions (gnutls_alloc_function alloc_func,
-                                     gnutls_alloc_function secure_alloc_func,
-                                     gnutls_is_secure_function is_secure_func,
-                                     gnutls_realloc_function realloc_func,
-                                     gnutls_free_function free_func);
+void
+gnutls_global_set_mem_functions(gnutls_alloc_function alloc_func,
+				gnutls_alloc_function secure_alloc_func,
+				gnutls_is_secure_function is_secure_func,
+				gnutls_realloc_function realloc_func,
+				gnutls_free_function free_func);
 
-  void gnutls_global_set_time_function (gnutls_time_func time_func);
+void gnutls_global_set_time_function(gnutls_time_func time_func);
 
 /* For use in callbacks */
-  extern gnutls_alloc_function gnutls_malloc;
-  extern gnutls_alloc_function gnutls_secure_malloc;
-  extern gnutls_realloc_function gnutls_realloc;
-  extern gnutls_calloc_function gnutls_calloc;
-  extern gnutls_free_function gnutls_free;
+extern gnutls_alloc_function gnutls_malloc;
+extern gnutls_alloc_function gnutls_secure_malloc;
+extern gnutls_realloc_function gnutls_realloc;
+extern gnutls_calloc_function gnutls_calloc;
+extern gnutls_free_function gnutls_free;
 
-  extern char *(*gnutls_strdup) (const char *);
+extern char *(*gnutls_strdup) (const char *);
 
-  typedef void (*gnutls_log_func) (int, const char *);
-  typedef void (*gnutls_audit_log_func) (gnutls_session_t, const char *);
-  void gnutls_global_set_log_function (gnutls_log_func log_func);
-  void gnutls_global_set_audit_log_function (gnutls_audit_log_func log_func);
-  void gnutls_global_set_log_level (int level);
+typedef void (*gnutls_log_func) (int, const char *);
+typedef void (*gnutls_audit_log_func) (gnutls_session_t, const char *);
+void gnutls_global_set_log_function(gnutls_log_func log_func);
+void gnutls_global_set_audit_log_function(gnutls_audit_log_func log_func);
+void gnutls_global_set_log_level(int level);
 
 /* Diffie-Hellman parameter handling.
  */
-  int gnutls_dh_params_init (gnutls_dh_params_t * dh_params);
-  void gnutls_dh_params_deinit (gnutls_dh_params_t dh_params);
-  int gnutls_dh_params_import_raw (gnutls_dh_params_t dh_params,
-                                   const gnutls_datum_t * prime,
-                                   const gnutls_datum_t * generator);
-  int gnutls_dh_params_import_pkcs3 (gnutls_dh_params_t params,
-                                     const gnutls_datum_t * pkcs3_params,
-                                     gnutls_x509_crt_fmt_t format);
-  int gnutls_dh_params_generate2 (gnutls_dh_params_t params,
-                                  unsigned int bits);
-  int gnutls_dh_params_export_pkcs3 (gnutls_dh_params_t params,
-                                     gnutls_x509_crt_fmt_t format,
-                                     unsigned char *params_data,
-                                     size_t * params_data_size);
-  int gnutls_dh_params_export2_pkcs3 (gnutls_dh_params_t params,
-                                      gnutls_x509_crt_fmt_t format,
-                                      gnutls_datum_t *out);
-  int gnutls_dh_params_export_raw (gnutls_dh_params_t params,
-                                   gnutls_datum_t * prime,
-                                   gnutls_datum_t * generator,
-                                   unsigned int *bits);
-  int gnutls_dh_params_cpy (gnutls_dh_params_t dst, gnutls_dh_params_t src);
+int gnutls_dh_params_init(gnutls_dh_params_t * dh_params);
+void gnutls_dh_params_deinit(gnutls_dh_params_t dh_params);
+int gnutls_dh_params_import_raw(gnutls_dh_params_t dh_params,
+				const gnutls_datum_t * prime,
+				const gnutls_datum_t * generator);
+int gnutls_dh_params_import_pkcs3(gnutls_dh_params_t params,
+				  const gnutls_datum_t * pkcs3_params,
+				  gnutls_x509_crt_fmt_t format);
+int gnutls_dh_params_generate2(gnutls_dh_params_t params,
+			       unsigned int bits);
+int gnutls_dh_params_export_pkcs3(gnutls_dh_params_t params,
+				  gnutls_x509_crt_fmt_t format,
+				  unsigned char *params_data,
+				  size_t * params_data_size);
+int gnutls_dh_params_export2_pkcs3(gnutls_dh_params_t params,
+				   gnutls_x509_crt_fmt_t format,
+				   gnutls_datum_t * out);
+int gnutls_dh_params_export_raw(gnutls_dh_params_t params,
+				gnutls_datum_t * prime,
+				gnutls_datum_t * generator,
+				unsigned int *bits);
+int gnutls_dh_params_cpy(gnutls_dh_params_t dst, gnutls_dh_params_t src);
 
 
 
 /* Session stuff
  */
-  typedef struct
-  {
-    void *iov_base;             /* Starting address */
-    size_t iov_len;             /* Number of bytes to transfer */
-  } giovec_t;
+typedef struct {
+	void *iov_base;		/* Starting address */
+	size_t iov_len;		/* Number of bytes to transfer */
+} giovec_t;
 
-  typedef ssize_t (*gnutls_pull_func) (gnutls_transport_ptr_t, void *,
-                                       size_t);
-  typedef ssize_t (*gnutls_push_func) (gnutls_transport_ptr_t, const void *,
-                                       size_t);
+typedef ssize_t(*gnutls_pull_func) (gnutls_transport_ptr_t, void *,
+				    size_t);
+typedef ssize_t(*gnutls_push_func) (gnutls_transport_ptr_t, const void *,
+				    size_t);
 
-  typedef int (*gnutls_pull_timeout_func) (gnutls_transport_ptr_t, unsigned int ms);
+typedef int (*gnutls_pull_timeout_func) (gnutls_transport_ptr_t,
+					 unsigned int ms);
 
-  typedef ssize_t (*gnutls_vec_push_func) (gnutls_transport_ptr_t,
-                                           const giovec_t * iov, int iovcnt);
+typedef ssize_t(*gnutls_vec_push_func) (gnutls_transport_ptr_t,
+					const giovec_t * iov, int iovcnt);
 
-  typedef int (*gnutls_errno_func) (gnutls_transport_ptr_t);
+typedef int (*gnutls_errno_func) (gnutls_transport_ptr_t);
 
-/* This will be defined as macro.
+#if 0
+ /* This will be defined as macro. */
   void gnutls_transport_set_int (gnutls_session_t session, int r);
- */
-  void gnutls_transport_set_int2 (gnutls_session_t session, int r, int s);
-  #define gnutls_transport_set_int(s, i) gnutls_transport_set_int2(s, i, i)
-  
-  void gnutls_transport_get_int2 (gnutls_session_t session, int * r, int *s);
-  int gnutls_transport_get_int (gnutls_session_t session);
-
-  void gnutls_transport_set_ptr (gnutls_session_t session,
-                                 gnutls_transport_ptr_t ptr);
-  void gnutls_transport_set_ptr2 (gnutls_session_t session,
-                                  gnutls_transport_ptr_t recv_ptr,
-                                  gnutls_transport_ptr_t send_ptr);
-
-  gnutls_transport_ptr_t gnutls_transport_get_ptr (gnutls_session_t session);
-  void gnutls_transport_get_ptr2 (gnutls_session_t session,
-                                  gnutls_transport_ptr_t * recv_ptr,
-                                  gnutls_transport_ptr_t * send_ptr);
-
-  void gnutls_transport_set_vec_push_function (gnutls_session_t session,
-                                            gnutls_vec_push_func vec_func);
-  void gnutls_transport_set_push_function (gnutls_session_t session,
-                                           gnutls_push_func push_func);
-  void gnutls_transport_set_pull_function (gnutls_session_t session,
-                                           gnutls_pull_func pull_func);
-
-  void gnutls_transport_set_pull_timeout_function (gnutls_session_t session,
-                                            gnutls_pull_timeout_func func);
-
-  void gnutls_transport_set_errno_function (gnutls_session_t session,
-                                            gnutls_errno_func errno_func);
-
-  void gnutls_transport_set_errno (gnutls_session_t session, int err);
+#endif
+
+void gnutls_transport_set_int2(gnutls_session_t session, int r, int s);
+#define gnutls_transport_set_int(s, i) gnutls_transport_set_int2(s, i, i)
+
+void gnutls_transport_get_int2(gnutls_session_t session, int *r, int *s);
+int gnutls_transport_get_int(gnutls_session_t session);
+
+void gnutls_transport_set_ptr(gnutls_session_t session,
+			      gnutls_transport_ptr_t ptr);
+void gnutls_transport_set_ptr2(gnutls_session_t session,
+			       gnutls_transport_ptr_t recv_ptr,
+			       gnutls_transport_ptr_t send_ptr);
+
+gnutls_transport_ptr_t gnutls_transport_get_ptr(gnutls_session_t session);
+void gnutls_transport_get_ptr2(gnutls_session_t session,
+			       gnutls_transport_ptr_t * recv_ptr,
+			       gnutls_transport_ptr_t * send_ptr);
+
+void gnutls_transport_set_vec_push_function(gnutls_session_t session,
+					    gnutls_vec_push_func vec_func);
+void gnutls_transport_set_push_function(gnutls_session_t session,
+					gnutls_push_func push_func);
+void gnutls_transport_set_pull_function(gnutls_session_t session,
+					gnutls_pull_func pull_func);
+
+void gnutls_transport_set_pull_timeout_function(gnutls_session_t session,
+						gnutls_pull_timeout_func
+						func);
+
+void gnutls_transport_set_errno_function(gnutls_session_t session,
+					 gnutls_errno_func errno_func);
+
+void gnutls_transport_set_errno(gnutls_session_t session, int err);
 
 /* session specific 
  */
-  void gnutls_session_set_ptr (gnutls_session_t session, void *ptr);
-  void *gnutls_session_get_ptr (gnutls_session_t session);
+void gnutls_session_set_ptr(gnutls_session_t session, void *ptr);
+void *gnutls_session_get_ptr(gnutls_session_t session);
 
-  void gnutls_openpgp_send_cert (gnutls_session_t session,
-                                 gnutls_openpgp_crt_status_t status);
+void gnutls_openpgp_send_cert(gnutls_session_t session,
+			      gnutls_openpgp_crt_status_t status);
 
 /* This function returns the hash of the given data.
  */
-  int gnutls_fingerprint (gnutls_digest_algorithm_t algo,
-                          const gnutls_datum_t * data, void *result,
-                          size_t * result_size);
+int gnutls_fingerprint(gnutls_digest_algorithm_t algo,
+		       const gnutls_datum_t * data, void *result,
+		       size_t * result_size);
 
   /**
    * gnutls_random_art_t:
@@ -1482,107 +1580,107 @@ gnutls_ecc_curve_t gnutls_ecc_curve_get(gnutls_session_t session);
    *
    * Enumeration of different random art types.
    */
-  typedef enum gnutls_random_art
-  {
-    GNUTLS_RANDOM_ART_OPENSSH=1,
-  } gnutls_random_art_t;
+typedef enum gnutls_random_art {
+	GNUTLS_RANDOM_ART_OPENSSH = 1,
+} gnutls_random_art_t;
 
-  int gnutls_random_art (gnutls_random_art_t type, 
-                         const char* key_type, unsigned int key_size,
-                         void * fpr, size_t fpr_size,
-                         gnutls_datum_t* art);
+int gnutls_random_art(gnutls_random_art_t type,
+		      const char *key_type, unsigned int key_size,
+		      void *fpr, size_t fpr_size, gnutls_datum_t * art);
 
 /* SRP 
  */
 
-  typedef struct gnutls_srp_server_credentials_st
-    *gnutls_srp_server_credentials_t;
-  typedef struct gnutls_srp_client_credentials_st
-    *gnutls_srp_client_credentials_t;
-
-  void
-    gnutls_srp_free_client_credentials (gnutls_srp_client_credentials_t sc);
-  int
-    gnutls_srp_allocate_client_credentials (gnutls_srp_client_credentials_t *
-                                            sc);
-  int gnutls_srp_set_client_credentials (gnutls_srp_client_credentials_t res,
-                                         const char *username,
-                                         const char *password);
-
-  void
-    gnutls_srp_free_server_credentials (gnutls_srp_server_credentials_t sc);
-  int
-    gnutls_srp_allocate_server_credentials (gnutls_srp_server_credentials_t *
-                                            sc);
-  int gnutls_srp_set_server_credentials_file (gnutls_srp_server_credentials_t
-                                              res, const char *password_file,
-                                              const char *password_conf_file);
-
-  const char *gnutls_srp_server_get_username (gnutls_session_t session);
-
-  extern void gnutls_srp_set_prime_bits (gnutls_session_t session,
-                                         unsigned int bits);
-
-  int gnutls_srp_verifier (const char *username,
-                           const char *password,
-                           const gnutls_datum_t * salt,
-                           const gnutls_datum_t * generator,
-                           const gnutls_datum_t * prime,
-                           gnutls_datum_t * res);
+typedef struct gnutls_srp_server_credentials_st
+*gnutls_srp_server_credentials_t;
+typedef struct gnutls_srp_client_credentials_st
+*gnutls_srp_client_credentials_t;
+
+void
+gnutls_srp_free_client_credentials(gnutls_srp_client_credentials_t sc);
+int
+gnutls_srp_allocate_client_credentials(gnutls_srp_client_credentials_t *
+				       sc);
+int gnutls_srp_set_client_credentials(gnutls_srp_client_credentials_t res,
+				      const char *username,
+				      const char *password);
+
+void
+gnutls_srp_free_server_credentials(gnutls_srp_server_credentials_t sc);
+int
+gnutls_srp_allocate_server_credentials(gnutls_srp_server_credentials_t *
+				       sc);
+int gnutls_srp_set_server_credentials_file(gnutls_srp_server_credentials_t
+					   res, const char *password_file,
+					   const char *password_conf_file);
+
+const char *gnutls_srp_server_get_username(gnutls_session_t session);
+
+void gnutls_srp_set_prime_bits(gnutls_session_t session,
+                               unsigned int bits);
+
+int gnutls_srp_verifier(const char *username,
+			const char *password,
+			const gnutls_datum_t * salt,
+			const gnutls_datum_t * generator,
+			const gnutls_datum_t * prime,
+			gnutls_datum_t * res);
 
 /* The static parameters defined in draft-ietf-tls-srp-05
  * Those should be used as input to gnutls_srp_verifier().
  */
-  extern const gnutls_datum_t gnutls_srp_4096_group_prime;
-  extern const gnutls_datum_t gnutls_srp_4096_group_generator;
-
-  extern const gnutls_datum_t gnutls_srp_3072_group_prime;
-  extern const gnutls_datum_t gnutls_srp_3072_group_generator;
-
-  extern const gnutls_datum_t gnutls_srp_2048_group_prime;
-  extern const gnutls_datum_t gnutls_srp_2048_group_generator;
-
-  extern const gnutls_datum_t gnutls_srp_1536_group_prime;
-  extern const gnutls_datum_t gnutls_srp_1536_group_generator;
-
-  extern const gnutls_datum_t gnutls_srp_1024_group_prime;
-  extern const gnutls_datum_t gnutls_srp_1024_group_generator;
-
-  typedef int gnutls_srp_server_credentials_function (gnutls_session_t,
-                                                      const char *username,
-                                                      gnutls_datum_t * salt,
-                                                      gnutls_datum_t *
-                                                      verifier,
-                                                      gnutls_datum_t *
-                                                      generator,
-                                                      gnutls_datum_t * prime);
-  void
-    gnutls_srp_set_server_credentials_function (
-     gnutls_srp_server_credentials_t cred,
-     gnutls_srp_server_credentials_function * func);
-
-  typedef int gnutls_srp_client_credentials_function (gnutls_session_t,
-                                                      char **, char **);
-  void
-    gnutls_srp_set_client_credentials_function (
-     gnutls_srp_client_credentials_t cred,
-     gnutls_srp_client_credentials_function * func);
-
-  int gnutls_srp_base64_encode (const gnutls_datum_t * data, char *result,
-                                size_t * result_size);
-  int gnutls_srp_base64_encode_alloc (const gnutls_datum_t * data,
-                                      gnutls_datum_t * result);
-
-  int gnutls_srp_base64_decode (const gnutls_datum_t * b64_data, char *result,
-                                size_t * result_size);
-  int gnutls_srp_base64_decode_alloc (const gnutls_datum_t * b64_data,
-                                      gnutls_datum_t * result);
+extern const gnutls_datum_t gnutls_srp_4096_group_prime;
+extern const gnutls_datum_t gnutls_srp_4096_group_generator;
+
+extern const gnutls_datum_t gnutls_srp_3072_group_prime;
+extern const gnutls_datum_t gnutls_srp_3072_group_generator;
+
+extern const gnutls_datum_t gnutls_srp_2048_group_prime;
+extern const gnutls_datum_t gnutls_srp_2048_group_generator;
+
+extern const gnutls_datum_t gnutls_srp_1536_group_prime;
+extern const gnutls_datum_t gnutls_srp_1536_group_generator;
+
+extern const gnutls_datum_t gnutls_srp_1024_group_prime;
+extern const gnutls_datum_t gnutls_srp_1024_group_generator;
+
+typedef int gnutls_srp_server_credentials_function(gnutls_session_t,
+						   const char *username,
+						   gnutls_datum_t * salt,
+						   gnutls_datum_t *
+						   verifier,
+						   gnutls_datum_t *
+						   generator,
+						   gnutls_datum_t * prime);
+void
+gnutls_srp_set_server_credentials_function(gnutls_srp_server_credentials_t
+					   cred,
+					   gnutls_srp_server_credentials_function
+					   * func);
+
+typedef int gnutls_srp_client_credentials_function(gnutls_session_t,
+						   char **, char **);
+void
+gnutls_srp_set_client_credentials_function(gnutls_srp_client_credentials_t
+					   cred,
+					   gnutls_srp_client_credentials_function
+					   * func);
+
+int gnutls_srp_base64_encode(const gnutls_datum_t * data, char *result,
+			     size_t * result_size);
+int gnutls_srp_base64_encode_alloc(const gnutls_datum_t * data,
+				   gnutls_datum_t * result);
+
+int gnutls_srp_base64_decode(const gnutls_datum_t * b64_data, char *result,
+			     size_t * result_size);
+int gnutls_srp_base64_decode_alloc(const gnutls_datum_t * b64_data,
+				   gnutls_datum_t * result);
 
 /* PSK stuff */
-  typedef struct gnutls_psk_server_credentials_st
-    *gnutls_psk_server_credentials_t;
-  typedef struct gnutls_psk_client_credentials_st
-    *gnutls_psk_client_credentials_t;
+typedef struct gnutls_psk_server_credentials_st
+*gnutls_psk_server_credentials_t;
+typedef struct gnutls_psk_client_credentials_st
+*gnutls_psk_client_credentials_t;
 
 /**
  * gnutls_psk_key_flags:
@@ -1591,66 +1689,66 @@ gnutls_ecc_curve_t gnutls_ecc_curve_get(gnutls_session_t session);
  *
  * Enumeration of different PSK key flags.
  */
-  typedef enum gnutls_psk_key_flags
-  {
-    GNUTLS_PSK_KEY_RAW = 0,
-    GNUTLS_PSK_KEY_HEX
-  } gnutls_psk_key_flags;
-
-  void
-    gnutls_psk_free_client_credentials (gnutls_psk_client_credentials_t sc);
-  int
-    gnutls_psk_allocate_client_credentials (gnutls_psk_client_credentials_t *
-                                            sc);
-  int gnutls_psk_set_client_credentials (gnutls_psk_client_credentials_t res,
-                                         const char *username,
-                                         const gnutls_datum_t * key,
-                                         gnutls_psk_key_flags flags);
-
-  void
-    gnutls_psk_free_server_credentials (gnutls_psk_server_credentials_t sc);
-  int
-    gnutls_psk_allocate_server_credentials (gnutls_psk_server_credentials_t *
-                                            sc);
-  int gnutls_psk_set_server_credentials_file (gnutls_psk_server_credentials_t
-                                              res, const char *password_file);
-
-  int
-    gnutls_psk_set_server_credentials_hint (gnutls_psk_server_credentials_t
-                                            res, const char *hint);
-
-  const char *gnutls_psk_server_get_username (gnutls_session_t session);
-  const char *gnutls_psk_client_get_hint (gnutls_session_t session);
-
-  typedef int gnutls_psk_server_credentials_function (gnutls_session_t,
-                                                      const char *username,
-                                                      gnutls_datum_t * key);
-  void
-    gnutls_psk_set_server_credentials_function (
-     gnutls_psk_server_credentials_t cred,
-     gnutls_psk_server_credentials_function * func);
-
-  typedef int gnutls_psk_client_credentials_function (gnutls_session_t,
-                                                      char **username,
-                                                      gnutls_datum_t * key);
-  void
-    gnutls_psk_set_client_credentials_function (
-     gnutls_psk_client_credentials_t cred,
-     gnutls_psk_client_credentials_function * func);
-
-  int gnutls_hex_encode (const gnutls_datum_t * data, char *result,
-                         size_t * result_size);
-  int gnutls_hex_decode (const gnutls_datum_t * hex_data, void *result,
-                         size_t * result_size);
-
-  void
-    gnutls_psk_set_server_dh_params (gnutls_psk_server_credentials_t res,
-                                     gnutls_dh_params_t dh_params);
-
-  void
-    gnutls_psk_set_server_params_function (gnutls_psk_server_credentials_t
-                                           res,
-                                           gnutls_params_function * func);
+typedef enum gnutls_psk_key_flags {
+	GNUTLS_PSK_KEY_RAW = 0,
+	GNUTLS_PSK_KEY_HEX
+} gnutls_psk_key_flags;
+
+void
+gnutls_psk_free_client_credentials(gnutls_psk_client_credentials_t sc);
+int
+gnutls_psk_allocate_client_credentials(gnutls_psk_client_credentials_t *
+				       sc);
+int gnutls_psk_set_client_credentials(gnutls_psk_client_credentials_t res,
+				      const char *username,
+				      const gnutls_datum_t * key,
+				      gnutls_psk_key_flags flags);
+
+void
+gnutls_psk_free_server_credentials(gnutls_psk_server_credentials_t sc);
+int
+gnutls_psk_allocate_server_credentials(gnutls_psk_server_credentials_t *
+				       sc);
+int gnutls_psk_set_server_credentials_file(gnutls_psk_server_credentials_t
+					   res, const char *password_file);
+
+int
+gnutls_psk_set_server_credentials_hint(gnutls_psk_server_credentials_t
+				       res, const char *hint);
+
+const char *gnutls_psk_server_get_username(gnutls_session_t session);
+const char *gnutls_psk_client_get_hint(gnutls_session_t session);
+
+typedef int gnutls_psk_server_credentials_function(gnutls_session_t,
+						   const char *username,
+						   gnutls_datum_t * key);
+void
+gnutls_psk_set_server_credentials_function(gnutls_psk_server_credentials_t
+					   cred,
+					   gnutls_psk_server_credentials_function
+					   * func);
+
+typedef int gnutls_psk_client_credentials_function(gnutls_session_t,
+						   char **username,
+						   gnutls_datum_t * key);
+void
+gnutls_psk_set_client_credentials_function(gnutls_psk_client_credentials_t
+					   cred,
+					   gnutls_psk_client_credentials_function
+					   * func);
+
+int gnutls_hex_encode(const gnutls_datum_t * data, char *result,
+		      size_t * result_size);
+int gnutls_hex_decode(const gnutls_datum_t * hex_data, void *result,
+		      size_t * result_size);
+
+void
+gnutls_psk_set_server_dh_params(gnutls_psk_server_credentials_t res,
+				gnutls_dh_params_t dh_params);
+
+void
+gnutls_psk_set_server_params_function(gnutls_psk_server_credentials_t
+				      res, gnutls_params_function * func);
 
 /**
  * gnutls_x509_subject_alt_name_t:
@@ -1665,28 +1763,27 @@ gnutls_ecc_curve_t gnutls_ecc_curve_get(gnutls_session_t session);
  *
  * Enumeration of different subject alternative names types.
  */
-  typedef enum gnutls_x509_subject_alt_name_t
-  {
-    GNUTLS_SAN_DNSNAME = 1,
-    GNUTLS_SAN_RFC822NAME = 2,
-    GNUTLS_SAN_URI = 3,
-    GNUTLS_SAN_IPADDRESS = 4,
-    GNUTLS_SAN_OTHERNAME = 5,
-    GNUTLS_SAN_DN = 6,
-    /* The following are "virtual" subject alternative name types, in
-       that they are represented by an otherName value and an OID.
-       Used by gnutls_x509_crt_get_subject_alt_othername_oid.  */
-    GNUTLS_SAN_OTHERNAME_XMPP = 1000
-  } gnutls_x509_subject_alt_name_t;
-
-  struct gnutls_openpgp_crt_int;
-  typedef struct gnutls_openpgp_crt_int *gnutls_openpgp_crt_t;
-
-  struct gnutls_openpgp_privkey_int;
-  typedef struct gnutls_openpgp_privkey_int *gnutls_openpgp_privkey_t;
-
-  struct gnutls_pkcs11_privkey_st;
-  typedef struct gnutls_pkcs11_privkey_st *gnutls_pkcs11_privkey_t;
+typedef enum gnutls_x509_subject_alt_name_t {
+	GNUTLS_SAN_DNSNAME = 1,
+	GNUTLS_SAN_RFC822NAME = 2,
+	GNUTLS_SAN_URI = 3,
+	GNUTLS_SAN_IPADDRESS = 4,
+	GNUTLS_SAN_OTHERNAME = 5,
+	GNUTLS_SAN_DN = 6,
+	/* The following are "virtual" subject alternative name types, in
+	   that they are represented by an otherName value and an OID.
+	   Used by gnutls_x509_crt_get_subject_alt_othername_oid.  */
+	GNUTLS_SAN_OTHERNAME_XMPP = 1000
+} gnutls_x509_subject_alt_name_t;
+
+struct gnutls_openpgp_crt_int;
+typedef struct gnutls_openpgp_crt_int *gnutls_openpgp_crt_t;
+
+struct gnutls_openpgp_privkey_int;
+typedef struct gnutls_openpgp_privkey_int *gnutls_openpgp_privkey_t;
+
+struct gnutls_pkcs11_privkey_st;
+typedef struct gnutls_pkcs11_privkey_st *gnutls_pkcs11_privkey_t;
 
 /**
  * gnutls_privkey_type_t:
@@ -1697,57 +1794,53 @@ gnutls_ecc_curve_t gnutls_ecc_curve_get(gnutls_session_t session);
  *
  * Enumeration of different private key types.
  */
-  typedef enum
-    {
-      GNUTLS_PRIVKEY_X509,
-      GNUTLS_PRIVKEY_OPENPGP,
-      GNUTLS_PRIVKEY_PKCS11,
-      GNUTLS_PRIVKEY_EXT
-    } gnutls_privkey_type_t;
-
-  typedef struct gnutls_retr2_st
-  {
-    gnutls_certificate_type_t cert_type;
-    gnutls_privkey_type_t key_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;
-      gnutls_pkcs11_privkey_t pkcs11;
-    } key;
-
-    unsigned int deinit_all;    /* if non zero all keys will be deinited */
-  } gnutls_retr2_st;
+typedef enum {
+	GNUTLS_PRIVKEY_X509,
+	GNUTLS_PRIVKEY_OPENPGP,
+	GNUTLS_PRIVKEY_PKCS11,
+	GNUTLS_PRIVKEY_EXT
+} gnutls_privkey_type_t;
+
+typedef struct gnutls_retr2_st {
+	gnutls_certificate_type_t cert_type;
+	gnutls_privkey_type_t key_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;
+		gnutls_pkcs11_privkey_t pkcs11;
+	} key;
+
+	unsigned int deinit_all;	/* if non zero all keys will be deinited */
+} gnutls_retr2_st;
 
 
   /* Functions that allow auth_info_t structures handling
    */
 
-  gnutls_credentials_type_t gnutls_auth_get_type (gnutls_session_t session);
-    gnutls_credentials_type_t
-    gnutls_auth_server_get_type (gnutls_session_t session);
-    gnutls_credentials_type_t
-    gnutls_auth_client_get_type (gnutls_session_t session);
+gnutls_credentials_type_t gnutls_auth_get_type(gnutls_session_t session);
+gnutls_credentials_type_t
+gnutls_auth_server_get_type(gnutls_session_t session);
+gnutls_credentials_type_t
+gnutls_auth_client_get_type(gnutls_session_t session);
 
   /* DH */
 
-  void gnutls_dh_set_prime_bits (gnutls_session_t session, unsigned int bits);
-  int gnutls_dh_get_secret_bits (gnutls_session_t session);
-  int gnutls_dh_get_peers_public_bits (gnutls_session_t session);
-  int gnutls_dh_get_prime_bits (gnutls_session_t session);
+void gnutls_dh_set_prime_bits(gnutls_session_t session, unsigned int bits);
+int gnutls_dh_get_secret_bits(gnutls_session_t session);
+int gnutls_dh_get_peers_public_bits(gnutls_session_t session);
+int gnutls_dh_get_prime_bits(gnutls_session_t session);
 
-  int gnutls_dh_get_group (gnutls_session_t session, gnutls_datum_t * raw_gen,
-                           gnutls_datum_t * raw_prime);
-  int gnutls_dh_get_pubkey (gnutls_session_t session,
-                            gnutls_datum_t * raw_key);
+int gnutls_dh_get_group(gnutls_session_t session, gnutls_datum_t * raw_gen,
+			gnutls_datum_t * raw_prime);
+int gnutls_dh_get_pubkey(gnutls_session_t session,
+			 gnutls_datum_t * raw_key);
 
   /* X509PKI */
 
@@ -1759,72 +1852,75 @@ gnutls_ecc_curve_t gnutls_ecc_curve_get(gnutls_session_t session);
    * instead. It's much more efficient.
    */
 
-  typedef int gnutls_certificate_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_retr2_st *);
-
-
-  void gnutls_certificate_set_retrieve_function (
-     gnutls_certificate_credentials_t cred,
-     gnutls_certificate_retrieve_function * func);
-
-  typedef int gnutls_certificate_verify_function (gnutls_session_t);
-  void
-    gnutls_certificate_set_verify_function (gnutls_certificate_credentials_t
-                                            cred,
-                                            gnutls_certificate_verify_function
-                                            * func);
-
-  void
-    gnutls_certificate_server_set_request (gnutls_session_t session,
-                                           gnutls_certificate_request_t req);
+typedef int gnutls_certificate_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_retr2_st *);
+
+
+void
+gnutls_certificate_set_retrieve_function(gnutls_certificate_credentials_t
+					 cred,
+					 gnutls_certificate_retrieve_function
+					 * func);
+
+typedef int gnutls_certificate_verify_function(gnutls_session_t);
+void
+gnutls_certificate_set_verify_function(gnutls_certificate_credentials_t
+				       cred,
+				       gnutls_certificate_verify_function
+				       * func);
+
+void
+gnutls_certificate_server_set_request(gnutls_session_t session,
+				      gnutls_certificate_request_t req);
 
   /* get data from the session
    */
-  const gnutls_datum_t *gnutls_certificate_get_peers (gnutls_session_t
-                                                      session,
-                                                      unsigned int
-                                                      *list_size);
-  const gnutls_datum_t *gnutls_certificate_get_ours (gnutls_session_t
-                                                     session);
-
-  int gnutls_certificate_get_peers_subkey_id(gnutls_session_t session,
-                                             gnutls_datum_t *id);
-
-  time_t gnutls_certificate_activation_time_peers (gnutls_session_t session);
-  time_t gnutls_certificate_expiration_time_peers (gnutls_session_t session);
-
-  int gnutls_certificate_client_get_request_status (gnutls_session_t session);
-  int gnutls_certificate_verify_peers2 (gnutls_session_t session,
-                                        unsigned int *status);
-  int gnutls_certificate_verify_peers3 (gnutls_session_t session,
-                                        const char* hostname,
-                                        unsigned int *status);
-
-  int gnutls_certificate_verification_status_print (unsigned int status,
-                       gnutls_certificate_type_t type,
-                       gnutls_datum_t * out, unsigned int flags);
-
-  int gnutls_pem_base64_encode (const char *msg, const gnutls_datum_t * data,
-                                char *result, size_t * result_size);
-  int gnutls_pem_base64_decode (const char *header,
-                                const gnutls_datum_t * b64_data,
-                                unsigned char *result, size_t * result_size);
-
-  int gnutls_pem_base64_encode_alloc (const char *msg,
-                                      const gnutls_datum_t * data,
-                                      gnutls_datum_t * result);
-  int gnutls_pem_base64_decode_alloc (const char *header,
-                                      const gnutls_datum_t * b64_data,
-                                      gnutls_datum_t * result);
+const gnutls_datum_t *gnutls_certificate_get_peers(gnutls_session_t
+						   session, unsigned int
+						   *list_size);
+const gnutls_datum_t *gnutls_certificate_get_ours(gnutls_session_t
+						  session);
+
+int gnutls_certificate_get_peers_subkey_id(gnutls_session_t session,
+					   gnutls_datum_t * id);
+
+time_t gnutls_certificate_activation_time_peers(gnutls_session_t session);
+time_t gnutls_certificate_expiration_time_peers(gnutls_session_t session);
+
+int gnutls_certificate_client_get_request_status(gnutls_session_t session);
+int gnutls_certificate_verify_peers2(gnutls_session_t session,
+				     unsigned int *status);
+int gnutls_certificate_verify_peers3(gnutls_session_t session,
+				     const char *hostname,
+				     unsigned int *status);
+
+int gnutls_certificate_verification_status_print(unsigned int status,
+						 gnutls_certificate_type_t
+						 type,
+						 gnutls_datum_t * out,
+						 unsigned int flags);
+
+int gnutls_pem_base64_encode(const char *msg, const gnutls_datum_t * data,
+			     char *result, size_t * result_size);
+int gnutls_pem_base64_decode(const char *header,
+			     const gnutls_datum_t * b64_data,
+			     unsigned char *result, size_t * result_size);
+
+int gnutls_pem_base64_encode_alloc(const char *msg,
+				   const gnutls_datum_t * data,
+				   gnutls_datum_t * result);
+int gnutls_pem_base64_decode_alloc(const char *header,
+				   const gnutls_datum_t * b64_data,
+				   gnutls_datum_t * result);
 
   /* key_usage will be an OR of the following values:
    */
@@ -1841,85 +1937,85 @@ gnutls_ecc_curve_t gnutls_ecc_curve_get(gnutls_session_t session);
 #define GNUTLS_KEY_ENCIPHER_ONLY	1
 #define GNUTLS_KEY_DECIPHER_ONLY	32768
 
-  void
-    gnutls_certificate_set_params_function (gnutls_certificate_credentials_t
-                                            res,
-                                            gnutls_params_function * func);
-  void gnutls_anon_set_params_function (gnutls_anon_server_credentials_t res,
-                                        gnutls_params_function * func);
-  void gnutls_psk_set_params_function (gnutls_psk_server_credentials_t res,
-                                       gnutls_params_function * func);
+void
+gnutls_certificate_set_params_function(gnutls_certificate_credentials_t
+				       res, gnutls_params_function * func);
+void gnutls_anon_set_params_function(gnutls_anon_server_credentials_t res,
+				     gnutls_params_function * func);
+void gnutls_psk_set_params_function(gnutls_psk_server_credentials_t res,
+				    gnutls_params_function * func);
 
-  int gnutls_hex2bin (const char *hex_data, size_t hex_size,
-                      void *bin_data, size_t * bin_size);
+int gnutls_hex2bin(const char *hex_data, size_t hex_size,
+		   void *bin_data, size_t * bin_size);
 
   /* Trust on first use (or ssh like) functions */
 
   /* stores the provided information to a database
    */
-  typedef int (*gnutls_tdb_store_func) (const char* db_name, 
-                                             const char* host,
-                                             const char* service,
-                                             time_t expiration,
-                                             const gnutls_datum_t* pubkey);
-
-  typedef int (*gnutls_tdb_store_commitment_func) (const char* db_name, 
-                                             const char* host,
-                                             const char* service,
-                                             time_t expiration,
-                                             gnutls_digest_algorithm_t hash_algo,
-                                             const gnutls_datum_t* hash);
-  
+typedef int (*gnutls_tdb_store_func) (const char *db_name,
+				      const char *host,
+				      const char *service,
+				      time_t expiration,
+				      const gnutls_datum_t * pubkey);
+
+typedef int (*gnutls_tdb_store_commitment_func) (const char *db_name,
+						 const char *host,
+						 const char *service,
+						 time_t expiration,
+						 gnutls_digest_algorithm_t
+						 hash_algo,
+						 const gnutls_datum_t *
+						 hash);
+
   /* searches for the provided host/service pair that match the
    * provided public key in the database. */
-  typedef int (*gnutls_tdb_verify_func) (const char* db_name, 
-                                            const char* host,
-                                            const char* service,
-                                            const gnutls_datum_t *pubkey);
-  
-
-  struct gnutls_tdb_int;
-  typedef struct gnutls_tdb_int *gnutls_tdb_t;
-  
-  int gnutls_tdb_init (gnutls_tdb_t *tdb);
-  void gnutls_tdb_set_store_func (gnutls_tdb_t tdb,
-				  gnutls_tdb_store_func store);
-  void gnutls_tdb_set_store_commitment_func (gnutls_tdb_t tdb,
-				     gnutls_tdb_store_commitment_func cstore);
-  void gnutls_tdb_set_verify_func (gnutls_tdb_t tdb,
-				   gnutls_tdb_verify_func verify);
-  void gnutls_tdb_deinit (gnutls_tdb_t tdb);
-
-  int gnutls_verify_stored_pubkey (const char* db_name,
-				   gnutls_tdb_t tdb,
-				   const char* host,
-				   const char* service,
-				   gnutls_certificate_type_t cert_type,
-				   const gnutls_datum_t * cert,
-				   unsigned int flags);
-
-  int gnutls_store_commitment (const char* db_name,
-			       gnutls_tdb_t tdb,
-			       const char* host,
-			       const char* service,
-			       gnutls_digest_algorithm_t hash_algo,
-			       const gnutls_datum_t* hash,
-			       time_t expiration,
-			       unsigned int flags);
-
-  int gnutls_store_pubkey (const char* db_name,
-			   gnutls_tdb_t tdb,
-			   const char* host,
-			   const char* service,
-			   gnutls_certificate_type_t cert_type,
-			   const gnutls_datum_t * cert,
-			   time_t expiration,
-			   unsigned int flags);
+typedef int (*gnutls_tdb_verify_func) (const char *db_name,
+				       const char *host,
+				       const char *service,
+				       const gnutls_datum_t * pubkey);
+
+
+struct gnutls_tdb_int;
+typedef struct gnutls_tdb_int *gnutls_tdb_t;
+
+int gnutls_tdb_init(gnutls_tdb_t * tdb);
+void gnutls_tdb_set_store_func(gnutls_tdb_t tdb,
+			       gnutls_tdb_store_func store);
+void gnutls_tdb_set_store_commitment_func(gnutls_tdb_t tdb,
+					  gnutls_tdb_store_commitment_func
+					  cstore);
+void gnutls_tdb_set_verify_func(gnutls_tdb_t tdb,
+				gnutls_tdb_verify_func verify);
+void gnutls_tdb_deinit(gnutls_tdb_t tdb);
+
+int gnutls_verify_stored_pubkey(const char *db_name,
+				gnutls_tdb_t tdb,
+				const char *host,
+				const char *service,
+				gnutls_certificate_type_t cert_type,
+				const gnutls_datum_t * cert,
+				unsigned int flags);
+
+int gnutls_store_commitment(const char *db_name,
+			    gnutls_tdb_t tdb,
+			    const char *host,
+			    const char *service,
+			    gnutls_digest_algorithm_t hash_algo,
+			    const gnutls_datum_t * hash,
+			    time_t expiration, unsigned int flags);
+
+int gnutls_store_pubkey(const char *db_name,
+			gnutls_tdb_t tdb,
+			const char *host,
+			const char *service,
+			gnutls_certificate_type_t cert_type,
+			const gnutls_datum_t * cert,
+			time_t expiration, unsigned int flags);
 
   /* Other helper functions */
-int gnutls_load_file(const char* filename, gnutls_datum_t * data);
+int gnutls_load_file(const char *filename, gnutls_datum_t * data);
 
-int gnutls_url_is_supported (const char* url);
+int gnutls_url_is_supported(const char *url);
 
   /* PIN callback */
 
@@ -1934,15 +2030,14 @@ int gnutls_url_is_supported (const char* url);
  *
  * Enumeration of different flags that are input to the PIN function.
  */
-  typedef enum
-    {
-    GNUTLS_PIN_USER = (1 << 0),
-    GNUTLS_PIN_SO = (1 << 1),
-    GNUTLS_PIN_FINAL_TRY = (1 << 2),
-    GNUTLS_PIN_COUNT_LOW = (1 << 3),
-    GNUTLS_PIN_CONTEXT_SPECIFIC = (1 << 4),
-    GNUTLS_PIN_WRONG = (1 << 5),
-  } gnutls_pin_flag_t;
+typedef enum {
+	GNUTLS_PIN_USER = (1 << 0),
+	GNUTLS_PIN_SO = (1 << 1),
+	GNUTLS_PIN_FINAL_TRY = (1 << 2),
+	GNUTLS_PIN_COUNT_LOW = (1 << 3),
+	GNUTLS_PIN_CONTEXT_SPECIFIC = (1 << 4),
+	GNUTLS_PIN_WRONG = (1 << 5),
+} gnutls_pin_flag_t;
 
 #define GNUTLS_PKCS11_PIN_USER GNUTLS_PIN_USER
 #define GNUTLS_PKCS11_PIN_SO GNUTLS_PIN_SO
@@ -1985,13 +2080,14 @@ int gnutls_url_is_supported (const char* url);
  * Since: 2.12.0
  **/
 typedef int (*gnutls_pin_callback_t) (void *userdata, int attempt,
-                                             const char *token_url,
-                                             const char *token_label,
-					     unsigned int flags,
-                                             char *pin, size_t pin_max);
+				      const char *token_url,
+				      const char *token_label,
+				      unsigned int flags,
+				      char *pin, size_t pin_max);
 
-  void gnutls_certificate_set_pin_function (gnutls_certificate_credentials_t,
-                                            gnutls_pin_callback_t fn, void *userdata);
+void gnutls_certificate_set_pin_function(gnutls_certificate_credentials_t,
+					 gnutls_pin_callback_t fn,
+					 void *userdata);
 
   /* Gnutls error codes. The mapping to a TLS alert is also shown in
    * comments.
@@ -2001,35 +2097,35 @@ typedef int (*gnutls_pin_callback_t) (void *userdata, int attempt,
 #define	GNUTLS_E_UNKNOWN_COMPRESSION_ALGORITHM -3
 #define	GNUTLS_E_UNKNOWN_CIPHER_TYPE -6
 #define	GNUTLS_E_LARGE_PACKET -7
-#define GNUTLS_E_UNSUPPORTED_VERSION_PACKET -8  /* GNUTLS_A_PROTOCOL_VERSION */
-#define GNUTLS_E_UNEXPECTED_PACKET_LENGTH -9    /* GNUTLS_A_RECORD_OVERFLOW */
+#define GNUTLS_E_UNSUPPORTED_VERSION_PACKET -8	/* GNUTLS_A_PROTOCOL_VERSION */
+#define GNUTLS_E_UNEXPECTED_PACKET_LENGTH -9	/* GNUTLS_A_RECORD_OVERFLOW */
 #define GNUTLS_E_INVALID_SESSION -10
 #define GNUTLS_E_FATAL_ALERT_RECEIVED -12
-#define GNUTLS_E_UNEXPECTED_PACKET -15  /* GNUTLS_A_UNEXPECTED_MESSAGE */
+#define GNUTLS_E_UNEXPECTED_PACKET -15	/* GNUTLS_A_UNEXPECTED_MESSAGE */
 #define GNUTLS_E_WARNING_ALERT_RECEIVED -16
 #define GNUTLS_E_ERROR_IN_FINISHED_PACKET -18
 #define GNUTLS_E_UNEXPECTED_HANDSHAKE_PACKET -19
-#define	GNUTLS_E_UNKNOWN_CIPHER_SUITE -21       /* GNUTLS_A_HANDSHAKE_FAILURE */
+#define	GNUTLS_E_UNKNOWN_CIPHER_SUITE -21	/* GNUTLS_A_HANDSHAKE_FAILURE */
 #define	GNUTLS_E_UNWANTED_ALGORITHM -22
 #define	GNUTLS_E_MPI_SCAN_FAILED -23
-#define GNUTLS_E_DECRYPTION_FAILED -24  /* GNUTLS_A_DECRYPTION_FAILED, GNUTLS_A_BAD_RECORD_MAC */
+#define GNUTLS_E_DECRYPTION_FAILED -24	/* GNUTLS_A_DECRYPTION_FAILED, GNUTLS_A_BAD_RECORD_MAC */
 #define GNUTLS_E_MEMORY_ERROR -25
-#define GNUTLS_E_DECOMPRESSION_FAILED -26       /* GNUTLS_A_DECOMPRESSION_FAILURE */
+#define GNUTLS_E_DECOMPRESSION_FAILED -26	/* GNUTLS_A_DECOMPRESSION_FAILURE */
 #define GNUTLS_E_COMPRESSION_FAILED -27
 #define GNUTLS_E_AGAIN -28
 #define GNUTLS_E_EXPIRED -29
 #define GNUTLS_E_DB_ERROR -30
 #define GNUTLS_E_SRP_PWD_ERROR -31
 #define GNUTLS_E_INSUFFICIENT_CREDENTIALS -32
-#define GNUTLS_E_INSUFICIENT_CREDENTIALS GNUTLS_E_INSUFFICIENT_CREDENTIALS      /* for backwards compatibility only */
+#define GNUTLS_E_INSUFICIENT_CREDENTIALS GNUTLS_E_INSUFFICIENT_CREDENTIALS	/* for backwards compatibility only */
 #define GNUTLS_E_INSUFFICIENT_CRED GNUTLS_E_INSUFFICIENT_CREDENTIALS
-#define GNUTLS_E_INSUFICIENT_CRED GNUTLS_E_INSUFFICIENT_CREDENTIALS     /* for backwards compatibility only */
+#define GNUTLS_E_INSUFICIENT_CRED GNUTLS_E_INSUFFICIENT_CREDENTIALS	/* for backwards compatibility only */
 
 #define GNUTLS_E_HASH_FAILED -33
 #define GNUTLS_E_BASE64_DECODING_ERROR -34
 
 #define	GNUTLS_E_MPI_PRINT_FAILED -35
-#define GNUTLS_E_REHANDSHAKE -37        /* GNUTLS_A_NO_RENEGOTIATION */
+#define GNUTLS_E_REHANDSHAKE -37	/* GNUTLS_A_NO_RENEGOTIATION */
 #define GNUTLS_E_GOT_APPLICATION_DATA -38
 #define GNUTLS_E_RECORD_LIMIT_REACHED -39
 #define GNUTLS_E_ENCRYPTION_FAILED -40
@@ -2039,13 +2135,13 @@ typedef int (*gnutls_pin_callback_t) (void *userdata, int attempt,
 #define GNUTLS_E_PK_SIGN_FAILED -46
 #define GNUTLS_E_X509_UNSUPPORTED_CRITICAL_EXTENSION -47
 #define GNUTLS_E_KEY_USAGE_VIOLATION -48
-#define GNUTLS_E_NO_CERTIFICATE_FOUND -49       /* GNUTLS_A_BAD_CERTIFICATE */
+#define GNUTLS_E_NO_CERTIFICATE_FOUND -49	/* GNUTLS_A_BAD_CERTIFICATE */
 #define GNUTLS_E_INVALID_REQUEST -50
 #define GNUTLS_E_SHORT_MEMORY_BUFFER -51
 #define GNUTLS_E_INTERRUPTED -52
 #define GNUTLS_E_PUSH_ERROR -53
 #define GNUTLS_E_PULL_ERROR -54
-#define GNUTLS_E_RECEIVED_ILLEGAL_PARAMETER -55 /* GNUTLS_A_ILLEGAL_PARAMETER */
+#define GNUTLS_E_RECEIVED_ILLEGAL_PARAMETER -55	/* GNUTLS_A_ILLEGAL_PARAMETER */
 #define GNUTLS_E_REQUESTED_DATA_NOT_AVAILABLE -56
 #define GNUTLS_E_PKCS1_WRONG_PAD -57
 #define GNUTLS_E_RECEIVED_ILLEGAL_EXTENSION -58
@@ -2088,7 +2184,7 @@ typedef int (*gnutls_pin_callback_t) (void *userdata, int attempt,
 #define GNUTLS_E_CERTIFICATE_ERROR -43
 #define GNUTLS_E_X509_CERTIFICATE_ERROR GNUTLS_E_CERTIFICATE_ERROR
 #define GNUTLS_E_CERTIFICATE_KEY_MISMATCH -60
-#define GNUTLS_E_UNSUPPORTED_CERTIFICATE_TYPE -61       /* GNUTLS_A_UNSUPPORTED_CERTIFICATE */
+#define GNUTLS_E_UNSUPPORTED_CERTIFICATE_TYPE -61	/* GNUTLS_A_UNSUPPORTED_CERTIFICATE */
 #define GNUTLS_E_X509_UNKNOWN_SAN -62
 #define GNUTLS_E_OPENPGP_FINGERPRINT_UNSUPPORTED -94
 #define GNUTLS_E_X509_UNSUPPORTED_ATTRIBUTE -95
@@ -2096,7 +2192,7 @@ typedef int (*gnutls_pin_callback_t) (void *userdata, int attempt,
 #define GNUTLS_E_UNKNOWN_PKCS_CONTENT_TYPE -97
 #define GNUTLS_E_UNKNOWN_PKCS_BAG_TYPE -98
 #define GNUTLS_E_INVALID_PASSWORD -99
-#define GNUTLS_E_MAC_VERIFY_FAILED -100 /* for PKCS #12 MAC */
+#define GNUTLS_E_MAC_VERIFY_FAILED -100	/* for PKCS #12 MAC */
 #define GNUTLS_E_CONSTRAINT_ERROR -101
 
 #define GNUTLS_E_WARNING_IA_IPHF_RECEIVED -102
@@ -2111,7 +2207,7 @@ typedef int (*gnutls_pin_callback_t) (void *userdata, int attempt,
 #define GNUTLS_E_PREMATURE_TERMINATION -110
 
 #define GNUTLS_E_BASE64_ENCODING_ERROR -201
-#define GNUTLS_E_INCOMPATIBLE_GCRYPT_LIBRARY -202       /* obsolete */
+#define GNUTLS_E_INCOMPATIBLE_GCRYPT_LIBRARY -202	/* obsolete */
 #define GNUTLS_E_INCOMPATIBLE_CRYPTO_LIBRARY -202
 #define GNUTLS_E_INCOMPATIBLE_LIBTASN1_LIBRARY -203
 
@@ -2181,6 +2277,7 @@ typedef int (*gnutls_pin_callback_t) (void *userdata, int attempt,
 #define GNUTLS_E_OCSP_RESPONSE_ERROR -341
 #define GNUTLS_E_RANDOM_DEVICE_ERROR -342
 #define GNUTLS_E_AUTH_ERROR -343
+#define GNUTLS_E_NO_APPLICATION_PROTOCOL -344
 
 #define GNUTLS_E_UNIMPLEMENTED_FEATURE -1250
 
@@ -2189,10 +2286,12 @@ typedef int (*gnutls_pin_callback_t) (void *userdata, int attempt,
 #define GNUTLS_E_APPLICATION_ERROR_MAX -65000
 #define GNUTLS_E_APPLICATION_ERROR_MIN -65500
 
+/* *INDENT-OFF* */
 #ifdef __cplusplus
 }
 #endif
+/* *INDENT-ON* */
 
 #include <gnutls/compat.h>
 
-#endif                          /* GNUTLS_H */
+#endif				/* GNUTLS_H */