glib2 1.1.8-x86-mingw32 → 1.1.9-x86-mingw32

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

@@ -1,13 +1,13 @@
 /*
- * Copyright (C) 2008 Free Software Foundation
+ * Copyright (C) 2008-2012 Free Software Foundation, Inc.
  *
  * Author: Nikos Mavrogiannopoulos
  *
- * This file is part of GNUTLS.
+ * This file is part of GnuTLS.
  *
- * The GNUTLS library is free software; you can redistribute it and/or
+ * The GnuTLS is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public License
- * as published by the Free Software Foundation; either version 2.1 of
+ * as published by the Free Software Foundation; either version 3 of
  * the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful, but
@@ -15,59 +15,92 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
  *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
- * USA
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>
  *
  */
 
-#if INTERNAL_GNUTLS_CRYPTO_H_ENABLE_UNSUPPORTED_API
-
 #ifndef GNUTLS_CRYPTO_H
-# define GNUTLS_CRYPTO_H
-
-typedef struct gnutls_crypto_cipher {
-  int (*init)( void** ctx);
-  int (*setkey)( void* ctx, const void * key, int keysize);
-  int (*setiv)(void* ctx, const void* iv, int ivsize);
-  int (*encrypt)(void* ctx, const void* plain, int plainsize, void* encr, int encrsize);
-  int (*decrypt)(void* ctx, const void* encr, int encrsize, void* plain, int plainsize);
-  void (*deinit)( void* ctx);
-} gnutls_crypto_cipher_st;
-
-typedef struct gnutls_crypto_mac {
-  int (*init)( void** ctx);
-  int (*setkey)( void* ctx, const void * key, int keysize);
-  int (*hash)( void* ctx, const void * text, int textsize);
-  int (*copy)( void** dst_ctx, void* src_ctx);
-  int (*output) ( void* src_ctx, void* digest, int digestsize);
-  void (*deinit)( void* ctx);
-} gnutls_crypto_mac_st;
-
-typedef enum gnutls_rnd_level
+#define GNUTLS_CRYPTO_H
+
+#ifdef __cplusplus
+extern "C"
 {
-  GNUTLS_RND_KEY = 0,
-  GNUTLS_RND_RANDOM = 1, /* unpredictable */
-  GNUTLS_RND_NONCE = 2,
-} gnutls_rnd_level_t;
+#endif
+
+  typedef struct api_cipher_hd_st *gnutls_cipher_hd_t;
+
+  int gnutls_cipher_init (gnutls_cipher_hd_t * handle,
+                          gnutls_cipher_algorithm_t cipher,
+                          const gnutls_datum_t * key,
+                          const gnutls_datum_t * iv);
+  int gnutls_cipher_encrypt (const gnutls_cipher_hd_t handle,
+                             void *text, size_t textlen);
+  int gnutls_cipher_decrypt (const gnutls_cipher_hd_t handle,
+                             void *ciphertext, size_t ciphertextlen);
+  int gnutls_cipher_decrypt2 (gnutls_cipher_hd_t handle,
+                              const void *ciphertext, size_t ciphertextlen,
+                              void *text, size_t textlen);
+  int gnutls_cipher_encrypt2 (gnutls_cipher_hd_t handle, const void *text,
+                              size_t textlen, void *ciphertext,
+                              size_t ciphertextlen);
+
+  void gnutls_cipher_set_iv (gnutls_cipher_hd_t handle, void *iv, size_t ivlen);
+
+  int gnutls_cipher_tag( gnutls_cipher_hd_t handle, void* tag, size_t tag_size);
+  int gnutls_cipher_add_auth( gnutls_cipher_hd_t handle, const void* text, size_t text_size);
 
-typedef struct gnutls_crypto_rnd {
-  int (*init)( void** ctx);
-  int (*rnd) ( void* ctx, int /* gnutls_rnd_level_t */ level, void* data, int datasize);
-  void (*deinit)( void* ctx);
-} gnutls_crypto_rnd_st;
+  void gnutls_cipher_deinit (gnutls_cipher_hd_t handle);
+  int gnutls_cipher_get_block_size (gnutls_cipher_algorithm_t algorithm);
 
-/* the same... setkey should be null */
-typedef gnutls_crypto_mac_st gnutls_crypto_digest_st;
 
-/* priority: infinity for backend algorithms, 90 for kernel algorithms - lowest wins 
+  typedef struct hash_hd_st *gnutls_hash_hd_t;
+  typedef struct hmac_hd_st *gnutls_hmac_hd_t;
+
+  int gnutls_hmac_init (gnutls_hmac_hd_t * dig,
+                        gnutls_mac_algorithm_t algorithm, const void *key,
+                        size_t keylen);
+  int gnutls_hmac (gnutls_hmac_hd_t handle, const void *text, size_t textlen);
+  void gnutls_hmac_output (gnutls_hmac_hd_t handle, void *digest);
+  void gnutls_hmac_deinit (gnutls_hmac_hd_t handle, void *digest);
+  int gnutls_hmac_get_len (gnutls_mac_algorithm_t algorithm);
+  int gnutls_hmac_fast (gnutls_mac_algorithm_t algorithm, const void *key,
+                        size_t keylen, const void *text, size_t textlen,
+                        void *digest);
+
+  int gnutls_hash_init (gnutls_hash_hd_t * dig,
+                        gnutls_digest_algorithm_t algorithm);
+  int gnutls_hash (gnutls_hash_hd_t handle, const void *text, size_t textlen);
+  void gnutls_hash_output (gnutls_hash_hd_t handle, void *digest);
+  void gnutls_hash_deinit (gnutls_hash_hd_t handle, void *digest);
+  int gnutls_hash_get_len (gnutls_digest_algorithm_t algorithm);
+  int gnutls_hash_fast (gnutls_digest_algorithm_t algorithm,
+                        const void *text, size_t textlen, void *digest);
+
+/* register ciphers */
+
+
+/**
+ * gnutls_rnd_level_t:
+ * @GNUTLS_RND_NONCE: Non-predictable random number.  Fatal in parts
+ *   of session if broken, i.e., vulnerable to statistical analysis.
+ * @GNUTLS_RND_RANDOM: Pseudo-random cryptographic random number.
+ *   Fatal in session if broken.
+ * @GNUTLS_RND_KEY: Fatal in many sessions if broken.
+ *
+ * Enumeration of random quality levels.
  */
-int gnutls_crypto_cipher_register( gnutls_cipher_algorithm_t algorithm, int priority, gnutls_crypto_cipher_st* s);
-int gnutls_crypto_mac_register( gnutls_mac_algorithm_t algorithm, int priority, gnutls_crypto_mac_st* s);
-int gnutls_crypto_digest_register( gnutls_digest_algorithm_t algorithm, int priority, gnutls_crypto_digest_st* s);
-int gnutls_crypto_rnd_register( int priority, gnutls_crypto_rnd_st* s);
+  typedef enum gnutls_rnd_level
+  {
+    GNUTLS_RND_NONCE = 0,
+    GNUTLS_RND_RANDOM = 1,
+    GNUTLS_RND_KEY = 2
+  } gnutls_rnd_level_t;
+
+  int gnutls_rnd (gnutls_rnd_level_t level, void *data, size_t len);
 
+#ifdef __cplusplus
+}
 #endif
 
 #endif

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

@@ -0,0 +1,88 @@
+/*
+ * Copyright (C) 2011-2012 Free Software Foundation, Inc.
+ *
+ * Author: Nikos Mavrogiannopoulos
+ *
+ * This file is part of GnuTLS.
+ *
+ * The GnuTLS is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public License
+ * as published by the Free Software Foundation; either version 3 of
+ * the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>
+ *
+ */
+
+/* This file contains the types and prototypes for the X.509
+ * certificate and CRL handling functions.
+ */
+
+#ifndef GNUTLS_DTLS_H
+#define GNUTLS_DTLS_H
+
+#include <gnutls/gnutls.h>
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
+#define GNUTLS_COOKIE_KEY_SIZE 16
+
+void gnutls_dtls_set_timeouts (gnutls_session_t session,
+			       unsigned int retrans_timeout,
+			       unsigned int total_timeout);
+
+unsigned int gnutls_dtls_get_mtu (gnutls_session_t session);
+unsigned int gnutls_dtls_get_data_mtu (gnutls_session_t session);
+
+void gnutls_dtls_set_mtu (gnutls_session_t session, unsigned int mtu);
+int gnutls_dtls_set_data_mtu (gnutls_session_t session, unsigned int mtu);
+
+unsigned int gnutls_dtls_get_timeout (gnutls_session_t session);
+
+/**
+ * gnutls_dtls_prestate_st:
+ * @record_seq: record sequence number
+ * @hsk_read_seq: handshake read sequence number
+ * @hsk_write_seq: handshake write sequence number
+ *
+ * DTLS cookie prestate struct.  This is usually never modified by
+ * the application, it is used to carry the cookie data between
+ * gnutls_dtls_cookie_send(), gnutls_dtls_cookie_verify() and
+ * gnutls_dtls_prestate_set().
+ */
+  typedef struct
+  {
+    unsigned int record_seq;
+    unsigned int hsk_read_seq;
+    unsigned int hsk_write_seq;
+  } gnutls_dtls_prestate_st;
+
+  int gnutls_dtls_cookie_send (gnutls_datum_t* key,
+			       void* client_data, size_t client_data_size,
+			       gnutls_dtls_prestate_st* prestate,
+			       gnutls_transport_ptr_t ptr,
+			       gnutls_push_func push_func);
+
+  int gnutls_dtls_cookie_verify (gnutls_datum_t* key,
+				 void* client_data, size_t client_data_size,
+				 void* _msg, size_t msg_size,
+				 gnutls_dtls_prestate_st* prestate);
+
+  void gnutls_dtls_prestate_set (gnutls_session_t session,
+				 gnutls_dtls_prestate_st* prestate);
+
+  unsigned int gnutls_record_get_discarded (gnutls_session_t session);
+#ifdef __cplusplus
+}
+#endif
+
+#endif                          /* GNUTLS_DTLS_H */

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

@@ -1,13 +1,13 @@
 /* -*- c -*-
- * Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation
+ * Copyright (C) 2000-2012 Free Software Foundation, Inc.
  *
- * Author: Nikos Mavroyanopoulos
+ * Author: Nikos Mavrogiannopoulos
  *
- * This file is part of GNUTLS.
+ * This file is part of GnuTLS.
  *
- * The GNUTLS library is free software; you can redistribute it and/or
+ * The GnuTLS is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public License
- * as published by the Free Software Foundation; either version 2.1 of
+ * as published by the Free Software Foundation; either version 3 of
  * the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful, but
@@ -15,94 +15,180 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
  *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
- * USA
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>
  *
  */
 
 /* This file contains the types and prototypes for all the
- * high level functionality of gnutls main library. For the
- * extra functionality (which is under the GNU GPL license) check
- * the gnutls/extra.h header. The openssl compatibility layer is
- * in gnutls/openssl.h.
+ * high level functionality of the gnutls main library.
  *
- * The low level cipher functionality is in libgcrypt. Check
- * gcrypt.h
+ * If the optional C++ binding was built, it is available in
+ * gnutls/gnutlsxx.h.
+ *
+ * The openssl compatibility layer (which is under the GNU GPL
+ * license) is in gnutls/openssl.h.
+ *
+ * The low level cipher functionality is in gnutls/crypto.h.
  */
 
 
 #ifndef GNUTLS_H
-# define GNUTLS_H
-
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-
-#define LIBGNUTLS_VERSION "2.4.2"
-
-#define LIBGNUTLS_VERSION_MAJOR 2
-#define LIBGNUTLS_VERSION_MINOR 4
-#define LIBGNUTLS_VERSION_PATCH 2
-
-#define LIBGNUTLS_VERSION_NUMBER 0x020402
-
-
+#define GNUTLS_H
 
 /* Get size_t. */
 #include <stddef.h>
 /* Get ssize_t. */
 #ifndef HAVE_SSIZE_T
-# define HAVE_SSIZE_T
+#define HAVE_SSIZE_T
+/* *INDENT-OFF* */
 #include <sys/types.h>
+/* *INDENT-ON* */
 #endif
 /* Get time_t. */
 #include <time.h>
-#include <gnutls/compat.h>
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
+#define GNUTLS_VERSION "3.1.5"
+
+#define GNUTLS_VERSION_MAJOR 3
+#define GNUTLS_VERSION_MINOR 1
+#define GNUTLS_VERSION_PATCH 5
+
+#define GNUTLS_VERSION_NUMBER 0x030105
 
 #define GNUTLS_CIPHER_RIJNDAEL_128_CBC GNUTLS_CIPHER_AES_128_CBC
 #define GNUTLS_CIPHER_RIJNDAEL_256_CBC GNUTLS_CIPHER_AES_256_CBC
 #define GNUTLS_CIPHER_RIJNDAEL_CBC GNUTLS_CIPHER_AES_128_CBC
 #define GNUTLS_CIPHER_ARCFOUR GNUTLS_CIPHER_ARCFOUR_128
 
+/**
+ * gnutls_cipher_algorithm_t:
+ * @GNUTLS_CIPHER_UNKNOWN: Unknown algorithm.
+ * @GNUTLS_CIPHER_NULL: NULL algorithm.
+ * @GNUTLS_CIPHER_ARCFOUR_128: ARCFOUR stream cipher with 128-bit keys.
+ * @GNUTLS_CIPHER_3DES_CBC: 3DES in CBC mode.
+ * @GNUTLS_CIPHER_AES_128_CBC: AES in CBC mode with 128-bit keys.
+ * @GNUTLS_CIPHER_AES_192_CBC: AES in CBC mode with 192-bit keys.
+ * @GNUTLS_CIPHER_AES_256_CBC: AES in CBC mode with 256-bit keys.
+ * @GNUTLS_CIPHER_ARCFOUR_40: ARCFOUR stream cipher with 40-bit keys.
+ * @GNUTLS_CIPHER_CAMELLIA_128_CBC: Camellia in CBC mode with 128-bit keys.
+ * @GNUTLS_CIPHER_CAMELLIA_192_CBC: Camellia in CBC mode with 192-bit keys.
+ * @GNUTLS_CIPHER_CAMELLIA_256_CBC: Camellia in CBC mode with 256-bit keys.
+ * @GNUTLS_CIPHER_RC2_40_CBC: RC2 in CBC mode with 40-bit keys.
+ * @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_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.
+ * @GNUTLS_CIPHER_BLOWFISH_PGP_CFB: Blowfish in CFB mode.
+ * @GNUTLS_CIPHER_SAFER_SK128_PGP_CFB: Safer-SK in CFB mode with 128-bit keys.
+ * @GNUTLS_CIPHER_AES128_PGP_CFB: AES in CFB mode with 128-bit keys.
+ * @GNUTLS_CIPHER_AES192_PGP_CFB: AES in CFB mode with 192-bit keys.
+ * @GNUTLS_CIPHER_AES256_PGP_CFB: AES in CFB mode with 256-bit keys.
+ * @GNUTLS_CIPHER_TWOFISH_PGP_CFB: Twofish in CFB mode.
+ *
+ * Enumeration of different symmetric encryption algorithms.
+ */
   typedef enum gnutls_cipher_algorithm
   {
     GNUTLS_CIPHER_UNKNOWN = 0,
     GNUTLS_CIPHER_NULL = 1,
-    GNUTLS_CIPHER_ARCFOUR_128,
-    GNUTLS_CIPHER_3DES_CBC,
-    GNUTLS_CIPHER_AES_128_CBC,
-    GNUTLS_CIPHER_AES_256_CBC,
-    GNUTLS_CIPHER_ARCFOUR_40,
-    GNUTLS_CIPHER_CAMELLIA_128_CBC,
-    GNUTLS_CIPHER_CAMELLIA_256_CBC,
+    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
+    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;
 
+/**
+ * gnutls_kx_algorithm_t:
+ * @GNUTLS_KX_UNKNOWN: Unknown key-exchange algorithm.
+ * @GNUTLS_KX_RSA: RSA key-exchange algorithm.
+ * @GNUTLS_KX_DHE_DSS: DHE-DSS key-exchange algorithm.
+ * @GNUTLS_KX_DHE_RSA: DHE-RSA key-exchange algorithm.
+ * @GNUTLS_KX_ECDHE_RSA: ECDHE-RSA key-exchange algorithm.
+ * @GNUTLS_KX_ECDHE_ECDSA: ECDHE-ECDSA key-exchange algorithm.
+ * @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_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.
+ *
+ * Enumeration of different key exchange algorithms.
+ */
   typedef enum
   {
     GNUTLS_KX_UNKNOWN = 0,
     GNUTLS_KX_RSA = 1,
-    GNUTLS_KX_DHE_DSS,
-    GNUTLS_KX_DHE_RSA,
-    GNUTLS_KX_ANON_DH,
-    GNUTLS_KX_SRP,
-    GNUTLS_KX_RSA_EXPORT,
-    GNUTLS_KX_SRP_RSA,
-    GNUTLS_KX_SRP_DSS,
-    GNUTLS_KX_PSK,
-    GNUTLS_KX_DHE_PSK
+    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;
 
+/**
+ * gnutls_params_type_t:
+ * @GNUTLS_PARAMS_RSA_EXPORT: Session RSA-EXPORT parameters.
+ * @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
+    GNUTLS_PARAMS_DH = 2,
+    GNUTLS_PARAMS_ECDH = 3,
   } gnutls_params_type_t;
 
+/**
+ * gnutls_credentials_type_t:
+ * @GNUTLS_CRD_CERTIFICATE: Certificate credential.
+ * @GNUTLS_CRD_ANON: Anonymous credential.
+ * @GNUTLS_CRD_SRP: SRP credential.
+ * @GNUTLS_CRD_PSK: PSK credential.
+ * @GNUTLS_CRD_IA: IA credential.
+ *
+ * Enumeration of different credential types.
+ */
   typedef enum
   {
     GNUTLS_CRD_CERTIFICATE = 1,
@@ -115,26 +201,58 @@ extern "C"
 #define GNUTLS_MAC_SHA GNUTLS_MAC_SHA1
 #define GNUTLS_DIG_SHA GNUTLS_DIG_SHA1
 
+/**
+ * gnutls_mac_algorithm_t:
+ * @GNUTLS_MAC_UNKNOWN: Unknown MAC algorithm.
+ * @GNUTLS_MAC_NULL: NULL MAC algorithm (empty output).
+ * @GNUTLS_MAC_MD5: HMAC-MD5 algorithm.
+ * @GNUTLS_MAC_SHA1: HMAC-SHA-1 algorithm.
+ * @GNUTLS_MAC_RMD160: HMAC-RMD160 algorithm.
+ * @GNUTLS_MAC_MD2: HMAC-MD2 algorithm.
+ * @GNUTLS_MAC_SHA256: HMAC-SHA-256 algorithm.
+ * @GNUTLS_MAC_SHA384: HMAC-SHA-384 algorithm.
+ * @GNUTLS_MAC_SHA512: HMAC-SHA-512 algorithm.
+ * @GNUTLS_MAC_SHA224: HMAC-SHA-224 algorithm.
+ * @GNUTLS_MAC_AEAD: MAC implicit through AEAD cipher.
+ *
+ * Enumeration of different Message Authentication Code (MAC)
+ * algorithms.
+ */
   typedef enum
   {
     GNUTLS_MAC_UNKNOWN = 0,
     GNUTLS_MAC_NULL = 1,
-    GNUTLS_MAC_MD5,
-    GNUTLS_MAC_SHA1,
-    GNUTLS_MAC_RMD160,
-    GNUTLS_MAC_MD2,
-    GNUTLS_MAC_SHA256,
-    GNUTLS_MAC_SHA384,
-    GNUTLS_MAC_SHA512
-    /* If you add anything here, make sure you align with
-       gnutls_digest_algorithm_t, in particular SHA-224. */
+    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;
 
-  /* The enumerations here should have the same value with
-     gnutls_mac_algorithm_t.
-   */
+/**
+ * gnutls_digest_algorithm_t:
+ * @GNUTLS_DIG_UNKNOWN: Unknown hash algorithm.
+ * @GNUTLS_DIG_NULL: NULL hash algorithm (empty output).
+ * @GNUTLS_DIG_MD5: MD5 algorithm.
+ * @GNUTLS_DIG_SHA1: SHA-1 algorithm.
+ * @GNUTLS_DIG_RMD160: RMD160 algorithm.
+ * @GNUTLS_DIG_MD2: MD2 algorithm.
+ * @GNUTLS_DIG_SHA256: SHA-256 algorithm.
+ * @GNUTLS_DIG_SHA384: SHA-384 algorithm.
+ * @GNUTLS_DIG_SHA512: SHA-512 algorithm.
+ * @GNUTLS_DIG_SHA224: SHA-224 algorithm.
+ *
+ * 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,
@@ -143,37 +261,99 @@ extern "C"
     GNUTLS_DIG_SHA256 = GNUTLS_MAC_SHA256,
     GNUTLS_DIG_SHA384 = GNUTLS_MAC_SHA384,
     GNUTLS_DIG_SHA512 = GNUTLS_MAC_SHA512,
-    GNUTLS_DIG_SHA224
+    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).
    */
-#define GNUTLS_MAX_ALGORITHM_NUM 16
-
-#define GNUTLS_COMP_ZLIB GNUTLS_COMP_DEFLATE
+#define GNUTLS_MAX_ALGORITHM_NUM 32
+
+/**
+ * gnutls_compression_method_t:
+ * @GNUTLS_COMP_UNKNOWN: Unknown compression method.
+ * @GNUTLS_COMP_NULL: The NULL compression method (no compression).
+ * @GNUTLS_COMP_DEFLATE: The DEFLATE compression method from zlib.
+ * @GNUTLS_COMP_ZLIB: Same as %GNUTLS_COMP_DEFLATE.
+ *
+ * Enumeration of different TLS compression methods.
+ */
   typedef enum
   {
     GNUTLS_COMP_UNKNOWN = 0,
     GNUTLS_COMP_NULL = 1,
-    GNUTLS_COMP_DEFLATE,
-    GNUTLS_COMP_LZO		/* only available if gnutls-extra has
-				   been initialized
-				 */
+    GNUTLS_COMP_DEFLATE = 2,
+    GNUTLS_COMP_ZLIB = GNUTLS_COMP_DEFLATE,
   } gnutls_compression_method_t;
 
-  typedef enum
-  {
-    GNUTLS_SERVER = 1,
-    GNUTLS_CLIENT
-  } gnutls_connection_end_t;
-
+  /*
+   * Flags for gnutls_init()
+   *
+   * @GNUTLS_SERVER: Connection end is a server.
+   * @GNUTLS_CLIENT: Connection end is a client.
+   * @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.
+   *
+   */
+#define GNUTLS_SERVER 1
+#define GNUTLS_CLIENT (1<<1)
+#define GNUTLS_DATAGRAM (1<<2)
+#define GNUTLS_NONBLOCK (1<<3)
+#define GNUTLS_NO_EXTENSIONS (1<<4)
+
+/**
+ * gnutls_alert_level_t:
+ * @GNUTLS_AL_WARNING: Alert of warning severity.
+ * @GNUTLS_AL_FATAL: Alert of fatal severity.
+ *
+ * Enumeration of different TLS alert severities.
+ */
   typedef enum
   {
     GNUTLS_AL_WARNING = 1,
     GNUTLS_AL_FATAL
   } gnutls_alert_level_t;
 
+/**
+ * gnutls_alert_description_t:
+ * @GNUTLS_A_CLOSE_NOTIFY: Close notify.
+ * @GNUTLS_A_UNEXPECTED_MESSAGE: Unexpected message.
+ * @GNUTLS_A_BAD_RECORD_MAC: Bad record MAC.
+ * @GNUTLS_A_DECRYPTION_FAILED: Decryption failed.
+ * @GNUTLS_A_RECORD_OVERFLOW: Record overflow.
+ * @GNUTLS_A_DECOMPRESSION_FAILURE: Decompression failed.
+ * @GNUTLS_A_HANDSHAKE_FAILURE: Handshake failed.
+ * @GNUTLS_A_SSL3_NO_CERTIFICATE: No certificate.
+ * @GNUTLS_A_BAD_CERTIFICATE: Certificate is bad.
+ * @GNUTLS_A_UNSUPPORTED_CERTIFICATE: Certificate is not supported.
+ * @GNUTLS_A_CERTIFICATE_REVOKED: Certificate was revoked.
+ * @GNUTLS_A_CERTIFICATE_EXPIRED: Certificate is expired.
+ * @GNUTLS_A_CERTIFICATE_UNKNOWN: Unknown certificate.
+ * @GNUTLS_A_ILLEGAL_PARAMETER: Illegal parameter.
+ * @GNUTLS_A_UNKNOWN_CA: CA is unknown.
+ * @GNUTLS_A_ACCESS_DENIED: Access was denied.
+ * @GNUTLS_A_DECODE_ERROR: Decode error.
+ * @GNUTLS_A_DECRYPT_ERROR: Decrypt error.
+ * @GNUTLS_A_EXPORT_RESTRICTION: Export restriction.
+ * @GNUTLS_A_PROTOCOL_VERSION: Error in protocol version.
+ * @GNUTLS_A_INSUFFICIENT_SECURITY: Insufficient security.
+ * @GNUTLS_A_USER_CANCELED: User canceled.
+ * @GNUTLS_A_INTERNAL_ERROR: Internal error.
+ * @GNUTLS_A_NO_RENEGOTIATION: No renegotiation is allowed.
+ * @GNUTLS_A_CERTIFICATE_UNOBTAINABLE: Could not retrieve the
+ *   specified certificate.
+ * @GNUTLS_A_UNSUPPORTED_EXTENSION: An unsupported extension was
+ *   sent.
+ * @GNUTLS_A_UNRECOGNIZED_NAME: The server name sent was not
+ *   recognized.
+ * @GNUTLS_A_UNKNOWN_PSK_IDENTITY: The SRP/PSK username is missing
+ *   or not known.
+ *
+ * Enumeration of different TLS alerts.
+ */
   typedef enum
   {
     GNUTLS_A_CLOSE_NOTIFY,
@@ -204,14 +384,36 @@ extern "C"
     GNUTLS_A_CERTIFICATE_UNOBTAINABLE = 111,
     GNUTLS_A_UNRECOGNIZED_NAME = 112,
     GNUTLS_A_UNKNOWN_PSK_IDENTITY = 115,
-    GNUTLS_A_INNER_APPLICATION_FAILURE = 208,
-    GNUTLS_A_INNER_APPLICATION_VERIFICATION = 209
   } gnutls_alert_description_t;
 
+/**
+ * gnutls_handshake_description_t:
+ * @GNUTLS_HANDSHAKE_HELLO_REQUEST: Hello request.
+ * @GNUTLS_HANDSHAKE_HELLO_VERIFY_REQUEST: DTLS Hello verify request.
+ * @GNUTLS_HANDSHAKE_CLIENT_HELLO: Client hello.
+ * @GNUTLS_HANDSHAKE_SERVER_HELLO: Server hello.
+ * @GNUTLS_HANDSHAKE_NEW_SESSION_TICKET: New session ticket.
+ * @GNUTLS_HANDSHAKE_CERTIFICATE_PKT: Certificate packet.
+ * @GNUTLS_HANDSHAKE_SERVER_KEY_EXCHANGE: Server key exchange.
+ * @GNUTLS_HANDSHAKE_CERTIFICATE_REQUEST: Certificate request.
+ * @GNUTLS_HANDSHAKE_SERVER_HELLO_DONE: Server hello done.
+ * @GNUTLS_HANDSHAKE_CERTIFICATE_VERIFY: Certificate verify.
+ * @GNUTLS_HANDSHAKE_CLIENT_KEY_EXCHANGE: Client key exchange.
+ * @GNUTLS_HANDSHAKE_FINISHED: Finished.
+ * @GNUTLS_HANDSHAKE_CERTIFICATE_STATUS: Certificate status (OCSP).
+ * @GNUTLS_HANDSHAKE_SUPPLEMENTAL: Supplemental.
+ * @GNUTLS_HANDSHAKE_CHANGE_CIPHER_SPEC: Change Cipher Spec.
+ * @GNUTLS_HANDSHAKE_CLIENT_HELLO_V2: SSLv2 Client Hello.
+ *
+ * Enumeration of different TLS handshake packets.
+ */
   typedef enum
-  { GNUTLS_HANDSHAKE_HELLO_REQUEST = 0,
+  {
+    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,
@@ -219,104 +421,299 @@ extern "C"
     GNUTLS_HANDSHAKE_CERTIFICATE_VERIFY = 15,
     GNUTLS_HANDSHAKE_CLIENT_KEY_EXCHANGE = 16,
     GNUTLS_HANDSHAKE_FINISHED = 20,
-    GNUTLS_HANDSHAKE_SUPPLEMENTAL = 23
+    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;
 
-/* Note that the status bits have different meanings
- * in openpgp keys and x.509 certificate verification.
+/**
+ * gnutls_certificate_status_t:
+ * @GNUTLS_CERT_INVALID: The certificate is not signed by one of the
+ *   known authorities or the signature is invalid (deprecated by the flags 
+ *   %GNUTLS_CERT_SIGNATURE_FAILURE and %GNUTLS_CERT_SIGNER_NOT_FOUND).
+ * @GNUTLS_CERT_SIGNATURE_FAILURE: The signature verification failed.
+ * @GNUTLS_CERT_REVOKED: Certificate is revoked by its authority.  In X.509 this will be
+ *   set only if CRLs are checked.
+ * @GNUTLS_CERT_SIGNER_NOT_FOUND: The certificate's issuer is not known. 
+ *   This is the case if the issuer is not included in the trusted certificate list.
+ * @GNUTLS_CERT_SIGNER_NOT_CA: The certificate's signer was not a CA. This
+ *   may happen if this was a version 1 certificate, which is common with 
+ *   some CAs, or a version 3 certificate without the basic constrains extension.
+ * @GNUTLS_CERT_SIGNER_CONSTRAINTS_FAILURE: The certificate's signer constraints were
+ *   violated.
+ * @GNUTLS_CERT_INSECURE_ALGORITHM:  The certificate was signed using an insecure
+ *   algorithm such as MD2 or MD5. These algorithms have been broken and
+ *   should not be trusted.
+ * @GNUTLS_CERT_NOT_ACTIVATED: The certificate is not yet activated.
+ * @GNUTLS_CERT_EXPIRED: The certificate has expired.
+ * @GNUTLS_CERT_REVOCATION_DATA_SUPERSEDED: The revocation data are old and have been superseded.
+ * @GNUTLS_CERT_REVOCATION_DATA_ISSUED_IN_FUTURE: The revocation data have a future issue date.
+ * @GNUTLS_CERT_UNEXPECTED_OWNER: The owner is not the expected one.
+ *
+ * Enumeration of certificate status codes.  Note that the status
+ * bits may have different meanings in OpenPGP keys and X.509
+ * certificate verification.
  */
   typedef enum
   {
-    GNUTLS_CERT_INVALID = 2,	/* will be set if the certificate
-				 * was not verified.
-				 */
-    GNUTLS_CERT_REVOKED = 32,	/* in X.509 this will be set only if CRLs are checked
-				 */
-
-    /* Those are extra information about the verification
-     * process. Will be set only if the certificate was 
-     * not verified.
-     */
-    GNUTLS_CERT_SIGNER_NOT_FOUND = 64,
-    GNUTLS_CERT_SIGNER_NOT_CA = 128,
-    GNUTLS_CERT_INSECURE_ALGORITHM = 256
+    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_certificate_status_t;
 
+/**
+ * gnutls_certificate_request_t:
+ * @GNUTLS_CERT_IGNORE: Ignore certificate.
+ * @GNUTLS_CERT_REQUEST: Request certificate.
+ * @GNUTLS_CERT_REQUIRE: Require certificate.
+ *
+ * Enumeration of certificate request types.
+ */
   typedef enum
   {
-    GNUTLS_CERT_IGNORE,
+    GNUTLS_CERT_IGNORE = 0,
     GNUTLS_CERT_REQUEST = 1,
-    GNUTLS_CERT_REQUIRE
+    GNUTLS_CERT_REQUIRE = 2
   } gnutls_certificate_request_t;
 
+/**
+ * gnutls_openpgp_crt_status_t:
+ * @GNUTLS_OPENPGP_CERT: Send entire certificate.
+ * @GNUTLS_OPENPGP_CERT_FINGERPRINT: Send only certificate fingerprint.
+ *
+ * Enumeration of ways to send OpenPGP certificate.
+ */
   typedef enum
-  { GNUTLS_OPENPGP_CERT,
-    GNUTLS_OPENPGP_CERT_FINGERPRINT
+  {
+    GNUTLS_OPENPGP_CERT = 0,
+    GNUTLS_OPENPGP_CERT_FINGERPRINT = 1
   } gnutls_openpgp_crt_status_t;
 
+/**
+ * gnutls_close_request_t:
+ * @GNUTLS_SHUT_RDWR: Disallow further receives/sends.
+ * @GNUTLS_SHUT_WR: Disallow further sends.
+ *
+ * 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;
 
-#define GNUTLS_TLS1 GNUTLS_TLS1_0
+/**
+ * gnutls_protocol_t:
+ * @GNUTLS_SSL3: SSL version 3.0.
+ * @GNUTLS_TLS1_0: TLS version 1.0.
+ * @GNUTLS_TLS1: Same as %GNUTLS_TLS1_0.
+ * @GNUTLS_TLS1_1: TLS version 1.1.
+ * @GNUTLS_TLS1_2: TLS version 1.2.
+ * @GNUTLS_DTLS1_0: DTLS version 1.0.
+ * @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,
-    GNUTLS_TLS1_1,
-    GNUTLS_TLS1_2,
+    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;
 
+/**
+ * gnutls_certificate_type_t:
+ * @GNUTLS_CRT_UNKNOWN: Unknown certificate type.
+ * @GNUTLS_CRT_X509: X.509 Certificate.
+ * @GNUTLS_CRT_OPENPGP: OpenPGP certificate.
+ * @GNUTLS_CRT_RAW: Raw public key (SubjectPublicKey)
+ *
+ * Enumeration of different certificate types.
+ */
   typedef enum
   {
     GNUTLS_CRT_UNKNOWN = 0,
     GNUTLS_CRT_X509 = 1,
-    GNUTLS_CRT_OPENPGP
+    GNUTLS_CRT_OPENPGP = 2,
+    GNUTLS_CRT_RAW = 3
   } gnutls_certificate_type_t;
 
+/**
+ * gnutls_x509_crt_fmt_t:
+ * @GNUTLS_X509_FMT_DER: X.509 certificate in DER format (binary).
+ * @GNUTLS_X509_FMT_PEM: X.509 certificate in PEM format (text).
+ *
+ * Enumeration of different certificate encoding formats.
+ */
   typedef enum
   {
-    GNUTLS_X509_FMT_DER,
-    GNUTLS_X509_FMT_PEM
+    GNUTLS_X509_FMT_DER = 0,
+    GNUTLS_X509_FMT_PEM = 1
   } gnutls_x509_crt_fmt_t;
 
+/**
+ * gnutls_certificate_print_formats_t:
+ * @GNUTLS_CRT_PRINT_FULL: Full information about certificate.
+ * @GNUTLS_CRT_PRINT_FULL_NUMBERS: Full information about certificate and include easy to parse public key parameters.
+ * @GNUTLS_CRT_PRINT_COMPACT: Information about certificate name in one line, plus identification of the public key.
+ * @GNUTLS_CRT_PRINT_ONELINE: Information about certificate in one line.
+ * @GNUTLS_CRT_PRINT_UNSIGNED_FULL: All info for an unsigned certificate.
+ *
+ * Enumeration of different certificate printing variants.
+ */
   typedef enum gnutls_certificate_print_formats
-    {
-      GNUTLS_CRT_PRINT_FULL,
-      GNUTLS_CRT_PRINT_ONELINE,
-      GNUTLS_CRT_PRINT_UNSIGNED_FULL,
-    } gnutls_certificate_print_formats_t;
-
+  {
+    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
+/**
+ * gnutls_pk_algorithm_t:
+ * @GNUTLS_PK_UNKNOWN: Unknown public-key algorithm.
+ * @GNUTLS_PK_RSA: RSA public-key algorithm.
+ * @GNUTLS_PK_DSA: DSA public-key algorithm.
+ * @GNUTLS_PK_DH: Diffie-Hellman algorithm. Used to generate parameters.
+ * @GNUTLS_PK_EC: Elliptic curve algorithm. Used to generate parameters.
+ *
+ * Enumeration of different public-key algorithms.
+ */
   typedef enum
   {
     GNUTLS_PK_UNKNOWN = 0,
     GNUTLS_PK_RSA = 1,
-    GNUTLS_PK_DSA
+    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);
 
-#define GNUTLS_SIGN_RSA_SHA GNUTLS_SIGN_RSA_SHA1
-#define GNUTLS_SIGN_DSA_SHA GNUTLS_SIGN_DSA_SHA1
+/**
+ * gnutls_sign_algorithm_t:
+ * @GNUTLS_SIGN_UNKNOWN: Unknown signature algorithm.
+ * @GNUTLS_SIGN_RSA_SHA1: Digital signature algorithm RSA with SHA-1
+ * @GNUTLS_SIGN_RSA_SHA: Same as %GNUTLS_SIGN_RSA_SHA1.
+ * @GNUTLS_SIGN_DSA_SHA1: Digital signature algorithm DSA with SHA-1
+ * @GNUTLS_SIGN_DSA_SHA224: Digital signature algorithm DSA with SHA-224
+ * @GNUTLS_SIGN_DSA_SHA256: Digital signature algorithm DSA with SHA-256
+ * @GNUTLS_SIGN_DSA_SHA: Same as %GNUTLS_SIGN_DSA_SHA1.
+ * @GNUTLS_SIGN_RSA_MD5: Digital signature algorithm RSA with MD5.
+ * @GNUTLS_SIGN_RSA_MD2: Digital signature algorithm RSA with MD2.
+ * @GNUTLS_SIGN_RSA_RMD160: Digital signature algorithm RSA with RMD-160.
+ * @GNUTLS_SIGN_RSA_SHA256: Digital signature algorithm RSA with SHA-256.
+ * @GNUTLS_SIGN_RSA_SHA384: Digital signature algorithm RSA with SHA-384.
+ * @GNUTLS_SIGN_RSA_SHA512: Digital signature algorithm RSA with SHA-512.
+ * @GNUTLS_SIGN_RSA_SHA224: Digital signature algorithm RSA with SHA-224.
+ * @GNUTLS_SIGN_ECDSA_SHA1: ECDSA with SHA1.
+ * @GNUTLS_SIGN_ECDSA_SHA256: Digital signature algorithm ECDSA with SHA-256.
+ * @GNUTLS_SIGN_ECDSA_SHA384: Digital signature algorithm ECDSA with SHA-384.
+ * @GNUTLS_SIGN_ECDSA_SHA512: Digital signature algorithm ECDSA with SHA-512.
+ * @GNUTLS_SIGN_ECDSA_SHA224: Digital signature algorithm ECDSA with SHA-224.
+ *
+ * Enumeration of different digital signature algorithms.
+ */
   typedef enum
   {
     GNUTLS_SIGN_UNKNOWN = 0,
     GNUTLS_SIGN_RSA_SHA1 = 1,
-    GNUTLS_SIGN_DSA_SHA1,
-    GNUTLS_SIGN_RSA_MD5,
-    GNUTLS_SIGN_RSA_MD2,
-    GNUTLS_SIGN_RSA_RMD160,
-    GNUTLS_SIGN_RSA_SHA256,
-    GNUTLS_SIGN_RSA_SHA384,
-    GNUTLS_SIGN_RSA_SHA512,
-    GNUTLS_SIGN_RSA_SHA224
+    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;
 
-  const char *gnutls_sign_algorithm_get_name (gnutls_sign_algorithm_t
-					      algorithm);
+/**
+ * gnutls_ecc_curve_t:
+ * @GNUTLS_ECC_CURVE_INVALID: Cannot be known
+ * @GNUTLS_ECC_CURVE_SECP192R1: the SECP192R1 curve
+ * @GNUTLS_ECC_CURVE_SECP224R1: the SECP224R1 curve
+ * @GNUTLS_ECC_CURVE_SECP256R1: the SECP256R1 curve
+ * @GNUTLS_ECC_CURVE_SECP384R1: the SECP384R1 curve
+ * @GNUTLS_ECC_CURVE_SECP521R1: the SECP521R1 curve
+ *
+ * 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,
+} gnutls_ecc_curve_t;
+
+/**
+ * gnutls_sec_param_t:
+ * @GNUTLS_SEC_PARAM_INSECURE: Less than 72 bits of security
+ * @GNUTLS_SEC_PARAM_WEAK: 72 bits of security
+ * @GNUTLS_SEC_PARAM_UNKNOWN: Cannot be known
+ * @GNUTLS_SEC_PARAM_LOW: 80 bits of security
+ * @GNUTLS_SEC_PARAM_LEGACY: 96 bits of security
+ * @GNUTLS_SEC_PARAM_NORMAL: 112 bits of security
+ * @GNUTLS_SEC_PARAM_HIGH: 128 bits of security
+ * @GNUTLS_SEC_PARAM_ULTRA: 192 bits of security
+ *
+ * Enumeration of security parameters for passive attacks.
+ */
+  typedef enum
+  {
+    GNUTLS_SEC_PARAM_INSECURE = -20,
+    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:
+ * @GNUTLS_CB_TLS_UNIQUE: "tls-unique" (RFC 5929) channel binding
+ *
+ * Enumeration of support channel binding types.
+ */
+  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.
@@ -329,6 +726,9 @@ extern "C"
   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;
+
   /* XXX ugly. */
   struct gnutls_x509_privkey_int;
   typedef struct gnutls_x509_privkey_int *gnutls_rsa_params_t;
@@ -349,41 +749,64 @@ extern "C"
     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 *);
+                                      gnutls_params_st *);
 
 /* internal functions */
 
   int gnutls_init (gnutls_session_t * session,
-		   gnutls_connection_end_t con_end);
+                   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_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);
+                         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);
+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);
+  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_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);
@@ -392,32 +815,49 @@ extern "C"
   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);
+                                           algorithm);
   const char *gnutls_kx_get_name (gnutls_kx_algorithm_t algorithm);
   const char *gnutls_certificate_type_get_name (gnutls_certificate_type_t
-						type);
-
-  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);
-
+                                                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);
+
+#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);
 
   /* 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 char *gnutls_cipher_suite_info (size_t i,
-					char *id,
-					gnutls_kx_algorithm_t *kx,
-					gnutls_cipher_algorithm_t *cipher,
-					gnutls_mac_algorithm_t *mac,
-					gnutls_protocol_t *version);
+  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);
@@ -425,24 +865,32 @@ extern "C"
 
   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);
-  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);
+                                                int allow);
+    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);
+
   ssize_t gnutls_record_send (gnutls_session_t session, const void *data,
-			      size_t sizeofdata);
+                              size_t data_size);
   ssize_t gnutls_record_recv (gnutls_session_t session, void *data,
-			      size_t sizeofdata);
+                              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);
 
   void gnutls_session_enable_compatibility_mode (gnutls_session_t session);
 
@@ -456,92 +904,144 @@ extern "C"
   size_t gnutls_record_check_pending (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);
+                  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);
-
-/* TLS Extensions */
+                      size_t label_size, const char *label,
+                      size_t seed_size, const char *seed,
+                      size_t outsize, char *out);
 
+/**
+ * gnutls_server_name_type_t:
+ * @GNUTLS_NAME_DNS: Domain Name System name type.
+ *
+ * Enumeration of different server name types.
+ */
   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);
+                              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);
-
-  /* Opaque PRF Input
-   * http://tools.ietf.org/id/draft-rescorla-tls-opaque-prf-input-00.txt
-   */
+                              void *data, size_t * data_length,
+                              unsigned int *type, unsigned int indx);
 
-  void
-  gnutls_oprfi_enable_client (gnutls_session_t session,
-			      size_t len,
-			      unsigned char *data);
+  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);
 
-  typedef int (*gnutls_oprfi_callback_func) (gnutls_session_t session,
-					     void *userdata,
-					     size_t oprfi_len,
-					     const unsigned char *in_oprfi,
-					     unsigned char *out_oprfi);
+#define GNUTLS_HB_PEER_ALLOWED_TO_SEND (1)
+#define GNUTLS_HB_PEER_NOT_ALLOWED_TO_SEND (1<<1)
 
-  void
-  gnutls_oprfi_enable_server (gnutls_session_t session,
-			      gnutls_oprfi_callback_func cb,
-			      void *userdata);
+  /* Heartbeat */
+  void gnutls_heartbeat_enable (gnutls_session_t session, unsigned int type);
 
-  /* Supplemental data, RFC 4680. */
-  typedef enum
-    {
-      GNUTLS_SUPPLEMENTAL_USER_MAPPING_DATA = 0
-    } gnutls_supplemental_data_format_type_t;
+#define GNUTLS_HB_LOCAL_ALLOWED_TO_SEND (1<<2)
+  int gnutls_heartbeat_allowed (gnutls_session_t session, unsigned int type);
 
-  const char *gnutls_supplemental_get_name
-  (gnutls_supplemental_data_format_type_t type);
+  /* Safe renegotiation */
+  int gnutls_safe_renegotiation_status (gnutls_session_t session);
 
-/* functions to set priority of cipher suites 
+/**
+ * gnutls_supplemental_data_format_type_t:
+ * @GNUTLS_SUPPLEMENTAL_USER_MAPPING_DATA: Supplemental user mapping data.
+ *
+ * Enumeration of different supplemental data types (RFC 4680).
  */
-  int gnutls_cipher_set_priority (gnutls_session_t session, const int *list);
-  int gnutls_mac_set_priority (gnutls_session_t session, const int *list);
-  int gnutls_compression_set_priority (gnutls_session_t session,
-				       const int *list);
-  int gnutls_kx_set_priority (gnutls_session_t session, const int *list);
-  int gnutls_protocol_set_priority (gnutls_session_t session,
-				    const int *list);
-  int gnutls_certificate_type_set_priority (gnutls_session_t session,
-					    const int *list);
+  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);
+
+  /* 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);
+
+  /* SRTP, RFC 5764 */
+
+/**
+ * gnutls_srtp_profile_t:
+ * @GNUTLS_SRTP_AES128_CM_HMAC_SHA1_80: 128 bit AES with a 80 bit HMAC-SHA1
+ * @GNUTLS_SRTP_AES128_CM_HMAC_SHA1_32: 128 bit AES with a 32 bit HMAC-SHA1
+ * @GNUTLS_SRTP_NULL_HMAC_SHA1_80: NULL cipher with a 80 bit HMAC-SHA1
+ * @GNUTLS_SRTP_NULL_HMAC_SHA1_32: NULL cipher with a 32 bit HMAC-SHA1
+ *
+ * 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);
 
 /* if you just want some defaults, use the following.
  */
-  int gnutls_priority_init( gnutls_priority_t*, const char *priority, const char** err_pos);
-  void gnutls_priority_deinit( gnutls_priority_t);
-  
-  int gnutls_priority_set(gnutls_session_t session, gnutls_priority_t);
-  int gnutls_priority_set_direct(gnutls_session_t session, const char *priority, const char** err_pos);
+  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);
 
   /* for compatibility
    */
   int gnutls_set_default_priority (gnutls_session_t session);
-  int gnutls_set_default_export_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);
+                                            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);
@@ -552,33 +1052,41 @@ extern "C"
 /* get/set session 
  */
   int gnutls_session_set_data (gnutls_session_t session,
-			       const void *session_data,
-			       size_t session_data_size);
+                               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);
+                               size_t * session_data_size);
   int gnutls_session_get_data2 (gnutls_session_t session,
-				gnutls_datum_t * data);
+                                gnutls_datum_t * data);
+  void gnutls_session_get_random (gnutls_session_t session, gnutls_datum_t* client, 
+                                  gnutls_datum_t* server);
+
+  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);
+                             size_t * session_id_size);
+  int gnutls_session_get_id2 (gnutls_session_t session, gnutls_datum_t *session_id);
 
-/* returns security values. 
- * Do not use them unless you know what you're doing.
- */
-#define TLS_MASTER_SIZE 48
-#define TLS_RANDOM_SIZE 32
-  const void *gnutls_session_get_server_random (gnutls_session_t session);
-  const void *gnutls_session_get_client_random (gnutls_session_t session);
-  const void *gnutls_session_get_master_secret (gnutls_session_t session);
+  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);
+                                       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);
 
@@ -586,22 +1094,24 @@ extern "C"
 
   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);
+                                        gnutls_db_retr_func retr_func);
   void gnutls_db_set_remove_function (gnutls_session_t session,
-				      gnutls_db_remove_func rem_func);
+                                      gnutls_db_remove_func rem_func);
   void gnutls_db_set_store_function (gnutls_session_t session,
-				     gnutls_db_store_func store_func);
+                                     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);
+                             gnutls_datum_t session_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);
 
-  typedef int (*gnutls_handshake_post_client_hello_func)(gnutls_session_t);
-  void gnutls_handshake_set_post_client_hello_function(gnutls_session_t,
-      gnutls_handshake_post_client_hello_func);
-  
   void gnutls_handshake_set_max_packet_length (gnutls_session_t session,
-					       size_t max);
+                                               size_t max);
 
 /* returns libgnutls version (call it with a NULL argument)
  */
@@ -614,9 +1124,27 @@ extern "C"
 /* cred is a structure defined by the kx algorithm
  */
   int gnutls_credentials_set (gnutls_session_t session,
-			      gnutls_credentials_type_t type, void *cred);
+                              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_x509_crl_int;
+  typedef struct gnutls_x509_crl_int *gnutls_x509_crl_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;
@@ -632,31 +1160,38 @@ extern "C"
   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);
+                                         gnutls_dh_params_t dh_params);
 
   void
     gnutls_anon_set_server_params_function (gnutls_anon_server_credentials_t
-					    res,
-					    gnutls_params_function * func);
+                                            res,
+                                            gnutls_params_function * func);
 
-  void gnutls_anon_free_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);
+                                             * 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);
+  void
+    gnutls_certificate_free_credentials (gnutls_certificate_credentials_t sc);
   int
     gnutls_certificate_allocate_credentials (gnutls_certificate_credentials_t
-					     * res);
+                                             * 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);
@@ -664,104 +1199,123 @@ extern "C"
   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_rsa_export_params (gnutls_certificate_credentials_t
-					      res,
-					      gnutls_rsa_params_t rsa_params);
+                                         gnutls_dh_params_t dh_params);
   void gnutls_certificate_set_verify_flags (gnutls_certificate_credentials_t
-					    res, unsigned int flags);
+                                            res, unsigned int flags);
   void gnutls_certificate_set_verify_limits (gnutls_certificate_credentials_t
-					     res, unsigned int max_bits,
-					     unsigned int max_depth);
+                                             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
-					      res, const char *CAFILE,
-					      gnutls_x509_crt_fmt_t type);
+  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);
+                                             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_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);
+                                           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_file (gnutls_certificate_credentials_t
-					    res, const char *CERTFILE,
-					    const char *KEYFILE,
-					    gnutls_x509_crt_fmt_t type);
   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);
+                                           res, const gnutls_datum_t * cert,
+                                           const gnutls_datum_t * key,
+                                           gnutls_x509_crt_fmt_t type);
 
   void gnutls_certificate_send_x509_rdn_sequence (gnutls_session_t session,
-                                             int status);
-                                             
+                                                  int status);
 
-  extern int
-    gnutls_certificate_set_x509_simple_pkcs12_file
-    (gnutls_certificate_credentials_t res, const char *pkcs12file,
+  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.
  */
-  struct gnutls_x509_privkey_int;
-  typedef struct gnutls_x509_privkey_int *gnutls_x509_privkey_t;
-
-  struct gnutls_x509_crl_int;
-  typedef struct gnutls_x509_crl_int *gnutls_x509_crl_t;
-
-  struct gnutls_x509_crt_int;
-  typedef struct gnutls_x509_crt_int *gnutls_x509_crt_t;
-
-  struct gnutls_openpgp_keyring_int;
-  typedef struct gnutls_openpgp_keyring_int *gnutls_openpgp_keyring_t;
 
   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);
+                                       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);
+                                         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);
+                                       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);
 
-  void gnutls_certificate_get_x509_cas (gnutls_certificate_credentials_t sc,
-					gnutls_x509_crt_t **x509_ca_list,
-					unsigned int* ncas);
+  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_get_x509_crls (gnutls_certificate_credentials_t sc,
-					 gnutls_x509_crl_t **x509_crl_list,
-					 unsigned int* ncrls);
+  int gnutls_certificate_set_ocsp_status_request_file (gnutls_certificate_credentials_t res,
+                                                       const char* response_file, unsigned int flags);
 
-  void gnutls_certificate_get_openpgp_keyring (gnutls_certificate_credentials_t sc,
-					       gnutls_openpgp_keyring_t *keyring);
+  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_is_checked (gnutls_session_t session, unsigned int flags);
 
 /* global state functions
  */
   int gnutls_global_init (void);
   void gnutls_global_deinit (void);
 
+  /**
+   * gnutls_time_func:
+   * @t: where to store time.
+   *
+   * Function prototype for time()-like function.  Set with
+   * gnutls_global_set_time_function().
+   *
+   * Returns: Number of seconds since the epoch, or (time_t)-1 on errors.
+   */
+  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);
+
+  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);
 
-  extern void
-    gnutls_global_set_mem_functions (gnutls_alloc_function gt_alloc_func,
-				     gnutls_alloc_function
-				     gt_secure_alloc_func,
-				     gnutls_is_secure_function
-				     gt_is_secure_func,
-				     gnutls_realloc_function gt_realloc_func,
-				     gnutls_free_function gt_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);
 
 /* For use in callbacks */
   extern gnutls_alloc_function gnutls_malloc;
@@ -773,87 +1327,83 @@ extern "C"
   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);
 
-/* Diffie Hellman parameter handling.
+/* 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);
+                                   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);
+                                     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);
+                                  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);
+                                     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);
+                                   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);
 
 
-/* RSA params 
- */
-  int gnutls_rsa_params_init (gnutls_rsa_params_t * rsa_params);
-  void gnutls_rsa_params_deinit (gnutls_rsa_params_t rsa_params);
-  int gnutls_rsa_params_cpy (gnutls_rsa_params_t dst,
-			     gnutls_rsa_params_t src);
-  int gnutls_rsa_params_import_raw (gnutls_rsa_params_t rsa_params,
-				    const gnutls_datum_t * m,
-				    const gnutls_datum_t * e,
-				    const gnutls_datum_t * d,
-				    const gnutls_datum_t * p,
-				    const gnutls_datum_t * q,
-				    const gnutls_datum_t * u);
-  int gnutls_rsa_params_generate2 (gnutls_rsa_params_t params,
-				   unsigned int bits);
-  int gnutls_rsa_params_export_raw (gnutls_rsa_params_t params,
-				    gnutls_datum_t * m, gnutls_datum_t * e,
-				    gnutls_datum_t * d, gnutls_datum_t * p,
-				    gnutls_datum_t * q, gnutls_datum_t * u,
-				    unsigned int *bits);
-  int gnutls_rsa_params_export_pkcs1 (gnutls_rsa_params_t params,
-				      gnutls_x509_crt_fmt_t format,
-				      unsigned char *params_data,
-				      size_t * params_data_size);
-  int gnutls_rsa_params_import_pkcs1 (gnutls_rsa_params_t params,
-				      const gnutls_datum_t * pkcs1_params,
-				      gnutls_x509_crt_fmt_t format);
 
 /* Session stuff
  */
+  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);
+                                       size_t);
   typedef ssize_t (*gnutls_push_func) (gnutls_transport_ptr_t, const void *,
-				       size_t);
+                                       size_t);
+
+  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 int (*gnutls_errno_func) (gnutls_transport_ptr_t);
+
   void gnutls_transport_set_ptr (gnutls_session_t session,
-				 gnutls_transport_ptr_t ptr);
+                                 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 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_lowat (gnutls_session_t session, int num);
-
+                                  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);
+                                           gnutls_push_func push_func);
   void gnutls_transport_set_pull_function (gnutls_session_t session,
-					   gnutls_pull_func pull_func);
+                                           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);
-  void gnutls_transport_set_global_errno (int err);
 
 /* session specific 
  */
@@ -861,15 +1411,29 @@ extern "C"
   void *gnutls_session_get_ptr (gnutls_session_t session);
 
   void gnutls_openpgp_send_cert (gnutls_session_t session,
-				gnutls_openpgp_crt_status_t status);
+                                 gnutls_openpgp_crt_status_t status);
 
-/* fingerprint 
- * Actually this function returns the hash of the given data.
+/* 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);
+                          const gnutls_datum_t * data, void *result,
+                          size_t * result_size);
+
+  /**
+   * gnutls_random_art_t:
+   * @GNUTLS_RANDOM_ART_OPENSSH: OpenSSH-style random art.
+   *
+   * Enumeration of different random art types.
+   */
+  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);
 
 /* SRP 
  */
@@ -879,33 +1443,45 @@ extern "C"
   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);
+  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);
+                                         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);
+  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);
+                                              res, const char *password_file,
+                                              const char *password_conf_file);
 
   const char *gnutls_srp_server_get_username (gnutls_session_t session);
 
-  extern 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);
+  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);
 
 /* 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;
 
@@ -916,34 +1492,34 @@ extern "C"
   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);
+                                                      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_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 **);
+                                                      char **, char **);
   void
-    gnutls_srp_set_client_credentials_function
-    (gnutls_srp_client_credentials_t cred,
+    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);
+                                size_t * result_size);
   int gnutls_srp_base64_encode_alloc (const gnutls_datum_t * data,
-				      gnutls_datum_t * result);
+                                      gnutls_datum_t * result);
 
   int gnutls_srp_base64_decode (const gnutls_datum_t * b64_data, char *result,
-				size_t * result_size);
+                                size_t * result_size);
   int gnutls_srp_base64_decode_alloc (const gnutls_datum_t * b64_data,
-				      gnutls_datum_t * result);
+                                      gnutls_datum_t * result);
 
 /* PSK stuff */
   typedef struct gnutls_psk_server_credentials_st
@@ -951,80 +1527,98 @@ extern "C"
   typedef struct gnutls_psk_client_credentials_st
     *gnutls_psk_client_credentials_t;
 
+/**
+ * gnutls_psk_key_flags:
+ * @GNUTLS_PSK_KEY_RAW: PSK-key in raw format.
+ * @GNUTLS_PSK_KEY_HEX: PSK-key in hex format.
+ *
+ * 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);
+  {
+    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 format);
-
-  void gnutls_psk_free_server_credentials (gnutls_psk_server_credentials_t
-					   sc);
-  int gnutls_psk_allocate_server_credentials (gnutls_psk_server_credentials_t
-					      * sc);
+                                         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);
+                                              res, const char *password_file);
 
   int
-  gnutls_psk_set_server_credentials_hint (gnutls_psk_server_credentials_t res,
-					  const char *hint);
+    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);
+                                                      const char *username,
+                                                      gnutls_datum_t * key);
   void
-    gnutls_psk_set_server_credentials_function
-    (gnutls_psk_server_credentials_t cred,
+    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);
+                                                      char **username,
+                                                      gnutls_datum_t * key);
   void
-    gnutls_psk_set_client_credentials_function
-    (gnutls_psk_client_credentials_t cred,
+    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, char *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);
-
-  int gnutls_psk_netconf_derive_key (const char *password,
-				     const char *psk_identity,
-				     const char *psk_identity_hint,
-				     gnutls_datum_t *output_key);
+                         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:
+ * @GNUTLS_SAN_DNSNAME: DNS-name SAN.
+ * @GNUTLS_SAN_RFC822NAME: E-mail address SAN.
+ * @GNUTLS_SAN_URI: URI SAN.
+ * @GNUTLS_SAN_IPADDRESS: IP address SAN.
+ * @GNUTLS_SAN_OTHERNAME: OtherName SAN.
+ * @GNUTLS_SAN_DN: DN SAN.
+ * @GNUTLS_SAN_OTHERNAME_XMPP: Virtual SAN, used by
+ *   gnutls_x509_crt_get_subject_alt_othername_oid.
+ *
+ * Enumeration of different subject alternative names types.
+ */
   typedef enum gnutls_x509_subject_alt_name_t
   {
     GNUTLS_SAN_DNSNAME = 1,
-    GNUTLS_SAN_RFC822NAME,
-    GNUTLS_SAN_URI,
-    GNUTLS_SAN_IPADDRESS,
-    GNUTLS_SAN_OTHERNAME,
-    GNUTLS_SAN_DN,
+    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().  */
+       Used by gnutls_x509_crt_get_subject_alt_othername_oid.  */
     GNUTLS_SAN_OTHERNAME_XMPP = 1000
   } gnutls_x509_subject_alt_name_t;
 
@@ -1034,38 +1628,47 @@ extern "C"
   struct gnutls_openpgp_privkey_int;
   typedef struct gnutls_openpgp_privkey_int *gnutls_openpgp_privkey_t;
 
-  typedef struct gnutls_retr_st
+  struct gnutls_pkcs11_privkey_st;
+  typedef struct gnutls_pkcs11_privkey_st *gnutls_pkcs11_privkey_t;
+
+/**
+ * gnutls_privkey_type_t:
+ * @GNUTLS_PRIVKEY_X509: X.509 private key, #gnutls_x509_privkey_t.
+ * @GNUTLS_PRIVKEY_OPENPGP: OpenPGP private key, #gnutls_openpgp_privkey_t.
+ * @GNUTLS_PRIVKEY_PKCS11: PKCS11 private key, #gnutls_pkcs11_privkey_t.
+ * @GNUTLS_PRIVKEY_EXT: External private key, operating using callbacks.
+ *
+ * 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 type;
-    union cert
+    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 */
+    unsigned int ncerts;        /* one for pgp keys */
 
-    union key
+    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_retr_st;
-
-  typedef int gnutls_certificate_client_retrieve_function (gnutls_session_t,
-							   const
-							   gnutls_datum_t *
-							   req_ca_rdn,
-							   int nreqs,
-							   const
-							   gnutls_pk_algorithm_t
-							   * pk_algos,
-							   int
-							   pk_algos_length,
-							   gnutls_retr_st *);
-  typedef int gnutls_certificate_server_retrieve_function (gnutls_session_t,
-							   gnutls_retr_st *);
+    unsigned int deinit_all;    /* if non zero all keys will be deinited */
+  } gnutls_retr2_st;
 
 
   /* Functions that allow auth_info_t structures handling
@@ -1085,77 +1688,86 @@ extern "C"
   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);
+                           gnutls_datum_t * raw_prime);
   int gnutls_dh_get_pubkey (gnutls_session_t session,
-			    gnutls_datum_t * raw_key);
-
-  /* RSA */
-  int gnutls_rsa_export_get_pubkey (gnutls_session_t session,
-				    gnutls_datum_t * exponent,
-				    gnutls_datum_t * modulus);
-  int gnutls_rsa_export_get_modulus_bits (gnutls_session_t session);
+                            gnutls_datum_t * raw_key);
 
   /* X509PKI */
 
-  /* External signing callback.  Experimental. */
-  typedef int (*gnutls_sign_func) (gnutls_session_t session,
-				   void *userdata,
-				   gnutls_certificate_type_t cert_type,
-				   const gnutls_datum_t * cert,
-				   const gnutls_datum_t * hash,
-				   gnutls_datum_t * signature);
-
-  void gnutls_sign_callback_set (gnutls_session_t session,
-				 gnutls_sign_func sign_func,
-				 void *userdata);
-  gnutls_sign_func
-  gnutls_sign_callback_get (gnutls_session_t session,
-			    void **userdata);
 
   /* These are set on the credentials structure.
    */
-  void gnutls_certificate_client_set_retrieve_function
-    (gnutls_certificate_credentials_t cred,
-     gnutls_certificate_client_retrieve_function * func);
-  void gnutls_certificate_server_set_retrieve_function
-    (gnutls_certificate_credentials_t cred,
-     gnutls_certificate_server_retrieve_function * func);
 
-  void gnutls_certificate_server_set_request (gnutls_session_t session,
-					      gnutls_certificate_request_t
-					      req);
+  /* use gnutls_certificate_set_retrieve_function2() in abstract.h
+   * 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);
 
   /* get data from the session
    */
   const gnutls_datum_t *gnutls_certificate_get_peers (gnutls_session_t
-						      session,
-						      unsigned int
-						      *list_size);
+                                                      session,
+                                                      unsigned int
+                                                      *list_size);
   const gnutls_datum_t *gnutls_certificate_get_ours (gnutls_session_t
-						     session);
+                                                     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);
+                                        unsigned int *status);
+  int gnutls_certificate_verify_peers3 (gnutls_session_t session,
+                                        const char* hostname,
+                                        unsigned int *status);
 
-  /* this is obsolete (?). */
-  int gnutls_certificate_verify_peers (gnutls_session_t session);
+  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);
+                                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);
+                                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);
+                                      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 * b64_data,
+                                      gnutls_datum_t * result);
 
   /* key_usage will be an OR of the following values:
    */
@@ -1173,15 +1785,157 @@ extern "C"
 #define GNUTLS_KEY_DECIPHER_ONLY	32768
 
   void
-  gnutls_certificate_set_params_function (gnutls_certificate_credentials_t res,
-					  gnutls_params_function * func);
+    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);
+                                        gnutls_params_function * func);
   void gnutls_psk_set_params_function (gnutls_psk_server_credentials_t res,
-				       gnutls_params_function * func);
+                                       gnutls_params_function * func);
+
+  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);
+  
+  /* 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);
+
+  /* Other helper functions */
+int gnutls_load_file(const char* filename, gnutls_datum_t * data);
+
+int gnutls_url_is_supported (const char* url);
+
+  /* PIN callback */
+
+/**
+ * gnutls_pin_flag_t:
+ * @GNUTLS_PIN_USER: The PIN for the user.
+ * @GNUTLS_PIN_SO: The PIN for the security officer (admin).
+ * @GNUTLS_PIN_CONTEXT_SPECIFIC: The PIN is for a specific action and key like signing.
+ * @GNUTLS_PIN_FINAL_TRY: This is the final try before blocking.
+ * @GNUTLS_PIN_COUNT_LOW: Few tries remain before token blocks.
+ * @GNUTLS_PIN_WRONG: Last given PIN was not correct.
+ *
+ * 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;
+
+#define GNUTLS_PKCS11_PIN_USER GNUTLS_PIN_USER
+#define GNUTLS_PKCS11_PIN_SO GNUTLS_PIN_SO
+#define GNUTLS_PKCS11_PIN_FINAL_TRY GNUTLS_PIN_FINAL_TRY
+#define GNUTLS_PKCS11_PIN_COUNT_LOW  GNUTLS_PIN_COUNT_LOW
+#define GNUTLS_PKCS11_PIN_CONTEXT_SPECIFIC GNUTLS_PIN_CONTEXT_SPECIFIC
+#define GNUTLS_PKCS11_PIN_WRONG GNUTLS_PIN_WRONG
+
+/**
+ * gnutls_pin_callback_t:
+ * @userdata: user-controlled data from gnutls_pkcs11_set_pin_function().
+ * @attempt: pin-attempt counter, initially 0.
+ * @token_url: URL of token.
+ * @token_label: label of token.
+ * @flags: a #gnutls_pin_flag_t flag.
+ * @pin: buffer to hold PIN, of size @pin_max.
+ * @pin_max: size of @pin buffer.
+ *
+ * Callback function type for PKCS#11 or TPM PIN entry.  It is set by
+ * functions like gnutls_pkcs11_set_pin_function().
+ *
+ * The callback should provides the PIN code to unlock the token with
+ * label @token_label, specified by the URL @token_url.
+ *
+ * The PIN code, as a NUL-terminated ASCII string, should be copied
+ * into the @pin buffer (of maximum size @pin_max), and return 0 to
+ * indicate success.  Alternatively, the callback may return a
+ * negative gnutls error code to indicate failure and cancel PIN entry
+ * (in which case, the contents of the @pin parameter are ignored).
+ *
+ * When a PIN is required, the callback will be invoked repeatedly
+ * (and indefinitely) until either the returned PIN code is correct,
+ * the callback returns failure, or the token refuses login (e.g. when
+ * the token is locked due to too many incorrect PINs!).  For the
+ * first such invocation, the @attempt counter will have value zero;
+ * it will increase by one for each subsequent attempt.
+ *
+ * Returns: %GNUTLS_E_SUCCESS (0) on success or a negative error code on error.
+ *
+ * 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);
+
+  void gnutls_certificate_set_pin_function (gnutls_certificate_credentials_t,
+                                            gnutls_pin_callback_t fn, void *userdata);
 
-  int gnutls_hex2bin (const char * hex_data, size_t hex_size,
-		      char * bin_data, size_t * bin_size);
 
   /* Gnutls error codes. The mapping to a TLS alert is also shown in
    * comments.
@@ -1191,35 +1945,35 @@ extern "C"
 #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
@@ -1229,13 +1983,13 @@ extern "C"
 #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
@@ -1244,21 +1998,13 @@ extern "C"
 #define GNUTLS_E_FILE_ERROR -64
 #define GNUTLS_E_TOO_MANY_EMPTY_PACKETS -78
 #define GNUTLS_E_UNKNOWN_PK_ALGORITHM -80
-
-
-  /* returned if libextra functionality was requested but
-   * gnutls_global_init_extra() was not called.
-   */
-#define GNUTLS_E_INIT_LIBEXTRA -82
-#define GNUTLS_E_LIBRARY_VERSION_MISMATCH -83
-
+#define GNUTLS_E_TOO_MANY_HANDSHAKE_PACKETS -81
 
   /* returned if you need to generate temporary RSA
    * parameters. These are needed for export cipher suites.
    */
 #define GNUTLS_E_NO_TEMPORARY_RSA_PARAMS -84
 
-#define GNUTLS_E_LZO_INIT_FAILED -85
 #define GNUTLS_E_NO_COMPRESSION_ALGORITHMS -86
 #define GNUTLS_E_NO_CIPHER_SUITES -87
 
@@ -1286,7 +2032,7 @@ extern "C"
 #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
@@ -1294,18 +2040,22 @@ extern "C"
 #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
 #define GNUTLS_E_WARNING_IA_FPHF_RECEIVED -103
 
 #define GNUTLS_E_IA_VERIFY_FAILED -104
-
 #define GNUTLS_E_UNKNOWN_ALGORITHM -105
+#define GNUTLS_E_UNSUPPORTED_SIGNATURE_ALGORITHM -106
+#define GNUTLS_E_SAFE_RENEGOTIATION_FAILED -107
+#define GNUTLS_E_UNSAFE_RENEGOTIATION_DENIED -108
+#define GNUTLS_E_UNKNOWN_SRP_USERNAME -109
+#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
 
@@ -1321,8 +2071,63 @@ extern "C"
 
 #define GNUTLS_E_HANDSHAKE_TOO_LARGE -210
 
+#define GNUTLS_E_CRYPTODEV_IOCTL_ERROR -211
+#define GNUTLS_E_CRYPTODEV_DEVICE_ERROR -212
+
+#define GNUTLS_E_CHANNEL_BINDING_NOT_AVAILABLE -213
+#define GNUTLS_E_BAD_COOKIE -214
+#define GNUTLS_E_OPENPGP_PREFERRED_KEY_ERROR -215
+#define GNUTLS_E_INCOMPAT_DSA_KEY_WITH_TLS_PROTOCOL -216
+
+#define GNUTLS_E_HEARTBEAT_PONG_RECEIVED -292
+#define GNUTLS_E_HEARTBEAT_PING_RECEIVED -293
+
+/* PKCS11 related */
+#define GNUTLS_E_PKCS11_ERROR -300
+#define GNUTLS_E_PKCS11_LOAD_ERROR -301
+#define GNUTLS_E_PARSING_ERROR -302
+#define GNUTLS_E_PKCS11_PIN_ERROR -303
+
+#define GNUTLS_E_PKCS11_SLOT_ERROR -305
+#define GNUTLS_E_LOCKING_ERROR -306
+#define GNUTLS_E_PKCS11_ATTRIBUTE_ERROR -307
+#define GNUTLS_E_PKCS11_DEVICE_ERROR -308
+#define GNUTLS_E_PKCS11_DATA_ERROR -309
+#define GNUTLS_E_PKCS11_UNSUPPORTED_FEATURE_ERROR -310
+#define GNUTLS_E_PKCS11_KEY_ERROR -311
+#define GNUTLS_E_PKCS11_PIN_EXPIRED -312
+#define GNUTLS_E_PKCS11_PIN_LOCKED -313
+#define GNUTLS_E_PKCS11_SESSION_ERROR -314
+#define GNUTLS_E_PKCS11_SIGNATURE_ERROR -315
+#define GNUTLS_E_PKCS11_TOKEN_ERROR -316
+#define GNUTLS_E_PKCS11_USER_ERROR -317
+
+#define GNUTLS_E_CRYPTO_INIT_FAILED -318
+#define GNUTLS_E_TIMEDOUT -319
+#define GNUTLS_E_USER_ERROR -320
+#define GNUTLS_E_ECC_NO_SUPPORTED_CURVES -321
+#define GNUTLS_E_ECC_UNSUPPORTED_CURVE -322
+#define GNUTLS_E_PKCS11_REQUESTED_OBJECT_NOT_AVAILBLE -323
+#define GNUTLS_E_CERTIFICATE_LIST_UNSORTED -324
+#define GNUTLS_E_ILLEGAL_PARAMETER -325
+#define GNUTLS_E_NO_PRIORITIES_WERE_SET -326
+#define GNUTLS_E_X509_UNSUPPORTED_EXTENSION -327
+#define GNUTLS_E_SESSION_EOF -328
+
+#define GNUTLS_E_TPM_ERROR -329
+#define GNUTLS_E_TPM_KEY_PASSWORD_ERROR -330
+#define GNUTLS_E_TPM_SRK_PASSWORD_ERROR -331
+#define GNUTLS_E_TPM_SESSION_ERROR -332
+#define GNUTLS_E_TPM_KEY_NOT_FOUND -333
+#define GNUTLS_E_TPM_UNINITIALIZED -334
+
+#define GNUTLS_E_NO_CERTIFICATE_STATUS -340
+#define GNUTLS_E_OCSP_RESPONSE_ERROR -341
+
 #define GNUTLS_E_UNIMPLEMENTED_FEATURE -1250
 
+
+
 #define GNUTLS_E_APPLICATION_ERROR_MAX -65000
 #define GNUTLS_E_APPLICATION_ERROR_MIN -65500
 
@@ -1330,4 +2135,6 @@ extern "C"
 }
 #endif
 
-#endif				/* GNUTLS_H */
+#include <gnutls/compat.h>
+
+#endif                          /* GNUTLS_H */