glib2 2.2.5-x86-mingw32 → 3.0.0-x86-mingw32

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

@@ -113,6 +113,9 @@ typedef gnutls_datum_t gnutls_datum _GNUTLS_GCC_ATTR_DEPRECATED;
 typedef gnutls_transport_ptr_t gnutls_transport_ptr
     _GNUTLS_GCC_ATTR_DEPRECATED;
 
+/* Old verification flags */
+#define GNUTLS_VERIFY_ALLOW_X509_V1_CA_CRT  (0)
+
 /* Old SRP alerts removed in 2.1.x because the TLS-SRP RFC was
    modified to use the PSK alert. */
 #define GNUTLS_A_MISSING_SRP_USERNAME GNUTLS_A_UNKNOWN_PSK_IDENTITY
@@ -157,67 +160,6 @@ typedef gnutls_openpgp_crt_t gnutls_openpgp_key_t
 #define LIBGNUTLS_VERSION_NUMBER GNUTLS_VERSION_NUMBER
 #define LIBGNUTLS_EXTRA_VERSION GNUTLS_VERSION
 
-/* The gnutls_retr_st was deprecated by gnutls_certificate_retrieve_function()
- * and gnutls_retr2_st.
- */
-typedef struct gnutls_retr_st {
-	gnutls_certificate_type_t type;
-	union {
-		gnutls_x509_crt_t *x509;
-		gnutls_openpgp_crt_t pgp;
-	} cert;
-	unsigned int ncerts;	/* one for pgp keys */
-
-	union {
-		gnutls_x509_privkey_t x509;
-		gnutls_openpgp_privkey_t pgp;
-	} key;
-
-	unsigned int deinit_all;	/* if non zero all keys will be deinited */
-} gnutls_retr_st;
-
-typedef int
-gnutls_certificate_client_retrieve_function(gnutls_session_t,
-					    const
-					    gnutls_datum_t *
-					    req_ca_rdn,
-					    int nreqs, const
-					    gnutls_pk_algorithm_t
-					    * pk_algos, int
-					    pk_algos_length,
-					    gnutls_retr_st *);
-typedef int
-gnutls_certificate_server_retrieve_function(gnutls_session_t,
-					    gnutls_retr_st *);
-
-void gnutls_certificate_client_set_retrieve_function
-    (gnutls_certificate_credentials_t cred,
-     gnutls_certificate_client_retrieve_function *
-     func) _GNUTLS_GCC_ATTR_DEPRECATED;
-void
- gnutls_certificate_server_set_retrieve_function
-    (gnutls_certificate_credentials_t cred,
-     gnutls_certificate_server_retrieve_function *
-     func) _GNUTLS_GCC_ATTR_DEPRECATED;
-
-	/* External signing callback.  No longer supported because it
-	 * was deprecated by the PKCS #11 API or gnutls_privkey_import_ext. */
-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_GCC_ATTR_DEPRECATED;
-gnutls_sign_func
-gnutls_sign_callback_get(gnutls_session_t session,
-			 void **userdata) _GNUTLS_GCC_ATTR_DEPRECATED;
-
 /* This is a very dangerous and error-prone function.
  * Use gnutls_privkey_sign_hash() instead.
  */
@@ -231,39 +173,6 @@ int gnutls_openpgp_privkey_sign_hash(gnutls_openpgp_privkey_t key,
 				     gnutls_datum_t * signature)
     _GNUTLS_GCC_ATTR_DEPRECATED;
 
-/* we support the gnutls_privkey_sign_data() instead.
- */
-int gnutls_x509_privkey_sign_data(gnutls_x509_privkey_t key,
-				  gnutls_digest_algorithm_t digest,
-				  unsigned int flags,
-				  const gnutls_datum_t * data,
-				  void *signature,
-				  size_t * signature_size)
-    _GNUTLS_GCC_ATTR_DEPRECATED;
-
-	/* gnutls_pubkey_verify_data() */
-int gnutls_x509_crt_verify_data(gnutls_x509_crt_t crt,
-				unsigned int flags,
-				const gnutls_datum_t * data,
-				const gnutls_datum_t * signature)
-    _GNUTLS_GCC_ATTR_DEPRECATED;
-
-
-	/* gnutls_pubkey_verify_hash() */
-int gnutls_x509_crt_verify_hash(gnutls_x509_crt_t crt,
-				unsigned int flags,
-				const gnutls_datum_t * hash,
-				const gnutls_datum_t * signature)
-    _GNUTLS_GCC_ATTR_DEPRECATED;
-
-	/* gnutls_pubkey_get_verify_algorithm() */
-int gnutls_x509_crt_get_verify_algorithm(gnutls_x509_crt_t crt,
-					 const gnutls_datum_t *
-					 signature,
-					 gnutls_digest_algorithm_t
-					 * hash)
-    _GNUTLS_GCC_ATTR_DEPRECATED;
-
 	/* gnutls_pubkey_get_preferred_hash_algorithm() */
 int gnutls_x509_crt_get_preferred_hash_algorithm(gnutls_x509_crt_t
 						 crt,
@@ -285,84 +194,7 @@ int gnutls_x509_crl_sign(gnutls_x509_crl_t crl,
 			 gnutls_x509_privkey_t issuer_key)
     _GNUTLS_GCC_ATTR_DEPRECATED;
 
-	/* functions to set priority of cipher suites
-	 */
-int gnutls_cipher_set_priority(gnutls_session_t session,
-			       const int *list)
-    _GNUTLS_GCC_ATTR_DEPRECATED;
-int gnutls_mac_set_priority(gnutls_session_t session,
-			    const int *list) _GNUTLS_GCC_ATTR_DEPRECATED;
-int gnutls_compression_set_priority(gnutls_session_t session,
-				    const int *list)
-    _GNUTLS_GCC_ATTR_DEPRECATED;
-int gnutls_kx_set_priority(gnutls_session_t session,
-			   const int *list) _GNUTLS_GCC_ATTR_DEPRECATED;
-int gnutls_protocol_set_priority(gnutls_session_t session,
-				 const int *list)
-    _GNUTLS_GCC_ATTR_DEPRECATED;
-int gnutls_certificate_type_set_priority(gnutls_session_t session,
-					 const int *list)
-    _GNUTLS_GCC_ATTR_DEPRECATED;
-
-/* RSA params 
- */
-int gnutls_rsa_params_init(gnutls_rsa_params_t *
-			   rsa_params) _GNUTLS_GCC_ATTR_DEPRECATED;
-void gnutls_rsa_params_deinit(gnutls_rsa_params_t rsa_params)
-    _GNUTLS_GCC_ATTR_DEPRECATED;
-int gnutls_rsa_params_cpy(gnutls_rsa_params_t dst,
-			  gnutls_rsa_params_t src)
-    _GNUTLS_GCC_ATTR_DEPRECATED;
-int gnutls_rsa_params_import_raw(gnutls_rsa_params_t rsa_params,
-				 const gnutls_datum_t * m,
-				 const gnutls_datum_t * e,
-				 const gnutls_datum_t * d,
-				 const gnutls_datum_t * p,
-				 const gnutls_datum_t * q,
-				 const gnutls_datum_t * u);
-int gnutls_rsa_params_generate2(gnutls_rsa_params_t params,
-				unsigned int bits)
-    _GNUTLS_GCC_ATTR_DEPRECATED;
-int gnutls_rsa_params_export_raw(gnutls_rsa_params_t rsa,
-				 gnutls_datum_t * m,
-				 gnutls_datum_t * e,
-				 gnutls_datum_t * d,
-				 gnutls_datum_t * p,
-				 gnutls_datum_t * q,
-				 gnutls_datum_t * u,
-				 unsigned int *bits)
-    _GNUTLS_GCC_ATTR_DEPRECATED;
-int gnutls_rsa_params_export_pkcs1(gnutls_rsa_params_t params,
-				   gnutls_x509_crt_fmt_t format,
-				   unsigned char *params_data,
-				   size_t *
-				   params_data_size)
-    _GNUTLS_GCC_ATTR_DEPRECATED;
-int gnutls_rsa_params_import_pkcs1(gnutls_rsa_params_t params,
-				   const gnutls_datum_t *
-				   pkcs1_params,
-				   gnutls_x509_crt_fmt_t format)
-    _GNUTLS_GCC_ATTR_DEPRECATED;
-
-int gnutls_rsa_export_get_pubkey(gnutls_session_t session,
-				 gnutls_datum_t * exponent,
-				 gnutls_datum_t *
-				 modulus) _GNUTLS_GCC_ATTR_DEPRECATED;
-int gnutls_rsa_export_get_modulus_bits(gnutls_session_t session)
-    _GNUTLS_GCC_ATTR_DEPRECATED;
-int gnutls_set_default_export_priority(gnutls_session_t session)
-    _GNUTLS_GCC_ATTR_DEPRECATED;
-
-void gnutls_certificate_set_rsa_export_params
-    (gnutls_certificate_credentials_t res,
-     gnutls_rsa_params_t rsa_params) _GNUTLS_GCC_ATTR_DEPRECATED;
-
 	/* use gnutls_privkey_sign_hash() with the GNUTLS_PRIVKEY_SIGN_FLAG_TLS1_RSA flag */
-int gnutls_privkey_sign_raw_data(gnutls_privkey_t key,
-				 unsigned flags,
-				 const gnutls_datum_t * data,
-				 gnutls_datum_t *
-				 signature) _GNUTLS_GCC_ATTR_DEPRECATED;
 
 #ifdef _ISOC99_SOURCE
 /* we provide older functions for compatibility as inline functions that
@@ -391,6 +223,15 @@ static inline const void
 }
 #endif
 
+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) _GNUTLS_GCC_ATTR_DEPRECATED;
+
+/* defined in old headers - unused nevertheless */
+#define GNUTLS_SUPPLEMENTAL_USER_MAPPING_DATA 0
 
 /* *INDENT-OFF* */
 #ifdef __cplusplus

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

@@ -60,6 +60,32 @@ int gnutls_cipher_get_block_size(gnutls_cipher_algorithm_t algorithm);
 int gnutls_cipher_get_iv_size(gnutls_cipher_algorithm_t algorithm);
 int gnutls_cipher_get_tag_size(gnutls_cipher_algorithm_t algorithm);
 
+/* AEAD API
+ */
+typedef struct api_aead_cipher_hd_st *gnutls_aead_cipher_hd_t;
+
+int gnutls_aead_cipher_init(gnutls_aead_cipher_hd_t * handle,
+			    gnutls_cipher_algorithm_t cipher,
+			    const gnutls_datum_t * key);
+int
+gnutls_aead_cipher_decrypt(gnutls_aead_cipher_hd_t handle,
+			   const void *nonce, size_t nonce_len,
+			   const void *auth, size_t auth_len,
+			   size_t tag_size,
+			   const void *ctext, size_t ctext_len,
+			   void *ptext, size_t *ptext_len);
+int
+gnutls_aead_cipher_encrypt(gnutls_aead_cipher_hd_t handle,
+			   const void *nonce, size_t nonce_len,
+			   const void *auth, size_t auth_len,
+			   size_t tag_size,
+			   const void *ptext, size_t ptext_len,
+			   void *ctext, size_t *ctext_len);
+
+void gnutls_aead_cipher_deinit(gnutls_aead_cipher_hd_t handle);
+
+/* Hash - MAC API */
+
 typedef struct hash_hd_st *gnutls_hash_hd_t;
 typedef struct hmac_hd_st *gnutls_hmac_hd_t;
 
@@ -109,6 +135,93 @@ int gnutls_rnd(gnutls_rnd_level_t level, void *data, size_t len);
 
 void gnutls_rnd_refresh(void);
 
+
+/* API to override ciphers and MAC algorithms 
+ */
+
+typedef int (*gnutls_cipher_init_func) (gnutls_cipher_algorithm_t, void **ctx, int enc);
+typedef int (*gnutls_cipher_setkey_func) (void *ctx, const void *key, size_t keysize);
+/* old style ciphers */
+typedef int (*gnutls_cipher_setiv_func) (void *ctx, const void *iv, size_t ivsize);
+typedef int (*gnutls_cipher_encrypt_func) (void *ctx, const void *plain, size_t plainsize,
+				void *encr, size_t encrsize);
+typedef int (*gnutls_cipher_decrypt_func) (void *ctx, const void *encr, size_t encrsize,
+			void *plain, size_t plainsize);
+
+/* aead ciphers */
+typedef int (*gnutls_cipher_auth_func) (void *ctx, const void *data, size_t datasize);
+typedef void (*gnutls_cipher_tag_func) (void *ctx, void *tag, size_t tagsize);
+
+typedef int (*gnutls_cipher_aead_encrypt_func) (void *ctx,
+ 			     const void *nonce, size_t noncesize,
+			     const void *auth, size_t authsize,
+			     size_t tag_size,
+			     const void *plain, size_t plainsize,
+			     void *encr, size_t encrsize);
+typedef int (*gnutls_cipher_aead_decrypt_func) (void *ctx,
+ 			     const void *nonce, size_t noncesize,
+			     const void *auth, size_t authsize,
+			     size_t tag_size,
+			     const void *encr, size_t encrsize,
+			     void *plain, size_t plainsize);
+typedef void (*gnutls_cipher_deinit_func) (void *ctx);
+
+int
+gnutls_crypto_register_cipher(gnutls_cipher_algorithm_t algorithm,
+			      int priority,
+			      gnutls_cipher_init_func init,
+			      gnutls_cipher_setkey_func setkey,
+			      gnutls_cipher_setiv_func setiv,
+			      gnutls_cipher_encrypt_func encrypt,
+			      gnutls_cipher_decrypt_func decrypt,
+			      gnutls_cipher_deinit_func deinit);
+
+int
+gnutls_crypto_register_aead_cipher(gnutls_cipher_algorithm_t algorithm,
+			      int priority,
+			      gnutls_cipher_init_func init,
+			      gnutls_cipher_setkey_func setkey,
+			      gnutls_cipher_aead_encrypt_func aead_encrypt,
+			      gnutls_cipher_aead_decrypt_func aead_decrypt,
+			      gnutls_cipher_deinit_func deinit);
+
+typedef int (*gnutls_mac_init_func) (gnutls_mac_algorithm_t, void **ctx);
+typedef int (*gnutls_mac_setkey_func) (void *ctx, const void *key, size_t keysize);
+typedef int (*gnutls_mac_setnonce_func) (void *ctx, const void *nonce, size_t noncesize);
+typedef int (*gnutls_mac_hash_func) (void *ctx, const void *text, size_t textsize);
+typedef int (*gnutls_mac_output_func) (void *src_ctx, void *digest, size_t digestsize);
+typedef void (*gnutls_mac_deinit_func) (void *ctx);
+typedef int (*gnutls_mac_fast_func) (gnutls_mac_algorithm_t, const void *nonce,
+		     size_t nonce_size, const void *key, size_t keysize,
+		     const void *text, size_t textsize, void *digest);
+
+int
+gnutls_crypto_register_mac(gnutls_mac_algorithm_t mac,
+			   int priority,
+			   gnutls_mac_init_func init,
+			   gnutls_mac_setkey_func setkey,
+			   gnutls_mac_setnonce_func setnonce,
+			   gnutls_mac_hash_func hash,
+			   gnutls_mac_output_func output,
+			   gnutls_mac_deinit_func deinit,
+			   gnutls_mac_fast_func hash_fast);
+
+typedef int (*gnutls_digest_init_func) (gnutls_digest_algorithm_t, void **ctx);
+typedef int (*gnutls_digest_hash_func) (void *ctx, const void *text, size_t textsize);
+typedef int (*gnutls_digest_output_func) (void *src_ctx, void *digest, size_t digestsize);
+typedef void (*gnutls_digest_deinit_func) (void *ctx);
+typedef int (*gnutls_digest_fast_func) (gnutls_digest_algorithm_t,
+		     const void *text, size_t textsize, void *digest);
+
+int
+gnutls_crypto_register_digest(gnutls_digest_algorithm_t digest,
+			   int priority,
+			   gnutls_digest_init_func init,
+			   gnutls_digest_hash_func hash,
+			   gnutls_digest_output_func output,
+			   gnutls_digest_deinit_func deinit,
+			   gnutls_digest_fast_func hash_fast);
+
 /* *INDENT-OFF* */
 #ifdef __cplusplus
 }

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

@@ -54,19 +54,25 @@ extern "C" {
 #endif
 /* *INDENT-ON* */
 
-#define GNUTLS_VERSION "3.2.21"
+#define GNUTLS_VERSION "3.4.4"
 
 #define GNUTLS_VERSION_MAJOR 3
-#define GNUTLS_VERSION_MINOR 2
-#define GNUTLS_VERSION_PATCH 21
+#define GNUTLS_VERSION_MINOR 4
+#define GNUTLS_VERSION_PATCH 4
 
-#define GNUTLS_VERSION_NUMBER 0x030215
+#define GNUTLS_VERSION_NUMBER 0x030404
 
 #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
 
+#if !defined(GNUTLS_INTERNAL_BUILD) && defined(_WIN32)
+# define _SYM_EXPORT __declspec(dllimport)
+#else
+# define _SYM_EXPORT
+#endif
+
 /**
  * gnutls_cipher_algorithm_t:
  * @GNUTLS_CIPHER_UNKNOWN: Unknown algorithm.
@@ -84,8 +90,15 @@ extern "C" {
  * @GNUTLS_CIPHER_DES_CBC: DES in CBC mode (56-bit keys).
  * @GNUTLS_CIPHER_AES_128_GCM: AES in GCM mode with 128-bit keys.
  * @GNUTLS_CIPHER_AES_256_GCM: AES in GCM mode with 256-bit keys.
+ * @GNUTLS_CIPHER_AES_128_CCM: AES in CCM mode with 128-bit keys.
+ * @GNUTLS_CIPHER_AES_256_CCM: AES in CCM mode with 256-bit keys.
+ * @GNUTLS_CIPHER_AES_128_CCM_8: AES in CCM mode with 64-bit tag and 128-bit keys.
+ * @GNUTLS_CIPHER_AES_256_CCM_8: AES in CCM mode with 64-bit tag and 256-bit keys.
  * @GNUTLS_CIPHER_CAMELLIA_128_GCM: CAMELLIA in GCM mode with 128-bit keys.
  * @GNUTLS_CIPHER_CAMELLIA_256_GCM: CAMELLIA in GCM mode with 256-bit keys.
+ * @GNUTLS_CIPHER_SALSA20_256: Salsa20 with 256-bit keys.
+ * @GNUTLS_CIPHER_ESTREAM_SALSA20_256: Estream's Salsa20 variant with 256-bit keys.
+ * @GNUTLS_CIPHER_CHACHA20_POLY1305: The Chacha20 cipher with the Poly1305 authenticator (AEAD).
  * @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.
@@ -108,16 +121,21 @@ typedef enum gnutls_cipher_algorithm {
 	GNUTLS_CIPHER_ARCFOUR_40 = 6,
 	GNUTLS_CIPHER_CAMELLIA_128_CBC = 7,
 	GNUTLS_CIPHER_CAMELLIA_256_CBC = 8,
-	GNUTLS_CIPHER_RC2_40_CBC = 90,
-	GNUTLS_CIPHER_DES_CBC = 91,
-	GNUTLS_CIPHER_AES_192_CBC = 92,
-	GNUTLS_CIPHER_AES_128_GCM = 93,
-	GNUTLS_CIPHER_AES_256_GCM = 94,
-	GNUTLS_CIPHER_CAMELLIA_192_CBC = 95,
-	GNUTLS_CIPHER_SALSA20_256 = 96,
-	GNUTLS_CIPHER_ESTREAM_SALSA20_256 = 97,
-	GNUTLS_CIPHER_CAMELLIA_128_GCM = 98,
-	GNUTLS_CIPHER_CAMELLIA_256_GCM = 99,
+	GNUTLS_CIPHER_AES_192_CBC = 9,
+	GNUTLS_CIPHER_AES_128_GCM = 10,
+	GNUTLS_CIPHER_AES_256_GCM = 11,
+	GNUTLS_CIPHER_CAMELLIA_192_CBC = 12,
+	GNUTLS_CIPHER_SALSA20_256 = 13,
+	GNUTLS_CIPHER_ESTREAM_SALSA20_256 = 14,
+	GNUTLS_CIPHER_CAMELLIA_128_GCM = 15,
+	GNUTLS_CIPHER_CAMELLIA_256_GCM = 16,
+	GNUTLS_CIPHER_RC2_40_CBC = 17,
+	GNUTLS_CIPHER_DES_CBC = 18,
+	GNUTLS_CIPHER_AES_128_CCM = 19,
+	GNUTLS_CIPHER_AES_256_CCM = 20,
+	GNUTLS_CIPHER_AES_128_CCM_8 = 21,
+	GNUTLS_CIPHER_AES_256_CCM_8 = 22,
+	GNUTLS_CIPHER_CHACHA20_POLY1305 = 23,
 
 	/* used only for PGP internals. Ignored in TLS/SSL
 	 */
@@ -169,7 +187,7 @@ typedef enum {
 	GNUTLS_KX_ECDHE_RSA = 12,
 	GNUTLS_KX_ECDHE_ECDSA = 13,
 	GNUTLS_KX_ECDHE_PSK = 14,
-	GNUTLS_KX_RSA_PSK = 15,
+	GNUTLS_KX_RSA_PSK = 15
 } gnutls_kx_algorithm_t;
 
 /**
@@ -183,7 +201,7 @@ typedef enum {
 typedef enum {
 	GNUTLS_PARAMS_RSA_EXPORT = 1,
 	GNUTLS_PARAMS_DH = 2,
-	GNUTLS_PARAMS_ECDH = 3,
+	GNUTLS_PARAMS_ECDH = 3
 } gnutls_params_type_t;
 
 /**
@@ -241,7 +259,7 @@ typedef enum {
 	   gnutls_digest_algorithm_t. */
 	GNUTLS_MAC_AEAD = 200,	/* indicates that MAC is on the cipher */
 	GNUTLS_MAC_UMAC_96 = 201,
-	GNUTLS_MAC_UMAC_128 = 202,
+	GNUTLS_MAC_UMAC_128 = 202
 } gnutls_mac_algorithm_t;
 
 /**
@@ -278,6 +296,8 @@ typedef enum {
    * algorithms (ciphers, kx or macs).
    */
 #define GNUTLS_MAX_ALGORITHM_NUM 32
+#define GNUTLS_MAX_SESSION_ID_SIZE 32
+
 
 /**
  * gnutls_compression_method_t:
@@ -292,7 +312,7 @@ typedef enum {
 	GNUTLS_COMP_UNKNOWN = 0,
 	GNUTLS_COMP_NULL = 1,
 	GNUTLS_COMP_DEFLATE = 2,
-	GNUTLS_COMP_ZLIB = GNUTLS_COMP_DEFLATE,
+	GNUTLS_COMP_ZLIB = GNUTLS_COMP_DEFLATE
 } gnutls_compression_method_t;
 
   /*
@@ -301,7 +321,8 @@ typedef enum {
    * @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_NONBLOCK: Connection should not block.
+   * @GNUTLS_NO_SIGNAL: In systems where SIGPIPE is delivered on send, it will be disabled. That flag has effect in systems which support the MSG_NOSIGNAL sockets flag.
    * @GNUTLS_NO_EXTENSIONS: Do not enable any TLS extensions by default.
    * @GNUTLS_NO_REPLAY_PROTECTION: Disable any replay protection in DTLS.
    *
@@ -312,6 +333,7 @@ typedef enum {
 #define GNUTLS_NONBLOCK (1<<3)
 #define GNUTLS_NO_EXTENSIONS (1<<4)
 #define GNUTLS_NO_REPLAY_PROTECTION (1<<5)
+#define GNUTLS_NO_SIGNAL (1<<6)
 
 /**
  * gnutls_alert_level_t:
@@ -350,6 +372,7 @@ typedef enum {
  * @GNUTLS_A_INSUFFICIENT_SECURITY: Insufficient security.
  * @GNUTLS_A_USER_CANCELED: User canceled.
  * @GNUTLS_A_INTERNAL_ERROR: Internal error.
+ * @GNUTLS_A_INAPPROPRIATE_FALLBACK: Inappropriate fallback,
  * @GNUTLS_A_NO_RENEGOTIATION: No renegotiation is allowed.
  * @GNUTLS_A_CERTIFICATE_UNOBTAINABLE: Could not retrieve the
  *   specified certificate.
@@ -359,6 +382,8 @@ typedef enum {
  *   recognized.
  * @GNUTLS_A_UNKNOWN_PSK_IDENTITY: The SRP/PSK username is missing
  *   or not known.
+ * @GNUTLS_A_NO_APPLICATION_PROTOCOL: The ALPN protocol requested is
+ *   not supported by the peer.
  *
  * Enumeration of different TLS alerts.
  */
@@ -385,13 +410,14 @@ typedef enum {
 	GNUTLS_A_PROTOCOL_VERSION = 70,
 	GNUTLS_A_INSUFFICIENT_SECURITY,
 	GNUTLS_A_INTERNAL_ERROR = 80,
+	GNUTLS_A_INAPPROPRIATE_FALLBACK = 86,
 	GNUTLS_A_USER_CANCELED = 90,
 	GNUTLS_A_NO_RENEGOTIATION = 100,
 	GNUTLS_A_UNSUPPORTED_EXTENSION = 110,
 	GNUTLS_A_CERTIFICATE_UNOBTAINABLE = 111,
 	GNUTLS_A_UNRECOGNIZED_NAME = 112,
 	GNUTLS_A_UNKNOWN_PSK_IDENTITY = 115,
-	GNUTLS_A_NO_APPLICATION_PROTOCOL = 120,
+	GNUTLS_A_NO_APPLICATION_PROTOCOL = 120
 } gnutls_alert_description_t;
 
 /**
@@ -431,7 +457,7 @@ typedef enum {
 	GNUTLS_HANDSHAKE_CERTIFICATE_STATUS = 22,
 	GNUTLS_HANDSHAKE_SUPPLEMENTAL = 23,
 	GNUTLS_HANDSHAKE_CHANGE_CIPHER_SPEC = 254,
-	GNUTLS_HANDSHAKE_CLIENT_HELLO_V2 = 1024,
+	GNUTLS_HANDSHAKE_CLIENT_HELLO_V2 = 1024
 } gnutls_handshake_description_t;
 
 #define GNUTLS_HANDSHAKE_ANY ((unsigned int)-1)
@@ -464,6 +490,7 @@ const char
  * @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.
  * @GNUTLS_CERT_MISMATCH: The certificate presented isn't the expected one (TOFU)
+ * @GNUTLS_CERT_PURPOSE_MISMATCH: The certificate or an intermediate does not match the intended purpose (extended key usage).
  *
  * Enumeration of certificate status codes.  Note that the status
  * bits may have different meanings in OpenPGP keys and X.509
@@ -483,6 +510,7 @@ typedef enum {
 	GNUTLS_CERT_REVOCATION_DATA_ISSUED_IN_FUTURE = 1 << 15,
 	GNUTLS_CERT_SIGNER_CONSTRAINTS_FAILURE = 1 << 16,
 	GNUTLS_CERT_MISMATCH = 1 << 17,
+	GNUTLS_CERT_PURPOSE_MISMATCH = 1 << 18
 } gnutls_certificate_status_t;
 
 /**
@@ -544,10 +572,11 @@ typedef enum {
 	GNUTLS_TLS1 = GNUTLS_TLS1_0,
 	GNUTLS_TLS1_1 = 3,
 	GNUTLS_TLS1_2 = 4,
-	GNUTLS_DTLS0_9 = 6,	/* FIXME: at some point change it to 200 */
-	GNUTLS_DTLS1_0 = 5,	/* 201 */
+
+	GNUTLS_DTLS0_9 = 200,
+	GNUTLS_DTLS1_0 = 201,	/* 201 */
 	GNUTLS_DTLS1_2 = 202,
-	GNUTLS_DTLS_VERSION_MIN = GNUTLS_DTLS1_0,
+	GNUTLS_DTLS_VERSION_MIN = GNUTLS_DTLS0_9,
 	GNUTLS_DTLS_VERSION_MAX = GNUTLS_DTLS1_2,
 	GNUTLS_TLS_VERSION_MAX = GNUTLS_TLS1_2,
 	GNUTLS_VERSION_UNKNOWN = 0xff	/* change it to 0xffff */
@@ -596,7 +625,7 @@ typedef enum gnutls_certificate_print_formats {
 	GNUTLS_CRT_PRINT_ONELINE = 1,
 	GNUTLS_CRT_PRINT_UNSIGNED_FULL = 2,
 	GNUTLS_CRT_PRINT_COMPACT = 3,
-	GNUTLS_CRT_PRINT_FULL_NUMBERS = 4,
+	GNUTLS_CRT_PRINT_FULL_NUMBERS = 4
 } gnutls_certificate_print_formats_t;
 
 #define GNUTLS_PK_ECC GNUTLS_PK_EC
@@ -615,7 +644,7 @@ typedef enum {
 	GNUTLS_PK_RSA = 1,
 	GNUTLS_PK_DSA = 2,
 	GNUTLS_PK_DH = 3,
-	GNUTLS_PK_EC = 4,
+	GNUTLS_PK_EC = 4
 } gnutls_pk_algorithm_t;
 
 const char *gnutls_pk_algorithm_get_name(gnutls_pk_algorithm_t algorithm);
@@ -628,6 +657,8 @@ const char *gnutls_pk_algorithm_get_name(gnutls_pk_algorithm_t algorithm);
  * @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_SHA384: Digital signature algorithm DSA with SHA-384
+ * @GNUTLS_SIGN_DSA_SHA512: Digital signature algorithm DSA with SHA-512
  * @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.
@@ -664,6 +695,8 @@ typedef enum {
 	GNUTLS_SIGN_ECDSA_SHA256 = 14,
 	GNUTLS_SIGN_ECDSA_SHA384 = 15,
 	GNUTLS_SIGN_ECDSA_SHA512 = 16,
+	GNUTLS_SIGN_DSA_SHA384 = 17,
+	GNUTLS_SIGN_DSA_SHA512 = 18
 } gnutls_sign_algorithm_t;
 
 /**
@@ -683,14 +716,14 @@ typedef enum {
 	GNUTLS_ECC_CURVE_SECP256R1,
 	GNUTLS_ECC_CURVE_SECP384R1,
 	GNUTLS_ECC_CURVE_SECP521R1,
-	GNUTLS_ECC_CURVE_SECP192R1,
+	GNUTLS_ECC_CURVE_SECP192R1
 } gnutls_ecc_curve_t;
 
 /* macros to allow specifying a specific curve in gnutls_privkey_generate()
  * and gnutls_x509_privkey_generate() */
-#define GNUTLS_CURVE_TO_BITS(curve) (unsigned int)((1<<31)|(curve))
-#define GNUTLS_BITS_TO_CURVE(bits) ((bits) & 0x7FFFFFFF)
-#define GNUTLS_BITS_ARE_CURVE(bits) ((bits) & 0x80000000)
+#define GNUTLS_CURVE_TO_BITS(curve) (unsigned int)((1<<31)|((unsigned int)(curve)))
+#define GNUTLS_BITS_TO_CURVE(bits) (((unsigned int)(bits)) & 0x7FFFFFFF)
+#define GNUTLS_BITS_ARE_CURVE(bits) (((unsigned int)(bits)) & 0x80000000)
 
 /**
  * gnutls_sec_param_t:
@@ -701,25 +734,28 @@ typedef enum {
  * @GNUTLS_SEC_PARAM_WEAK: 72 bits of security
  * @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_MEDIUM: 112 bits of security (used to be %GNUTLS_SEC_PARAM_NORMAL)
  * @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_EXPORT = -15,
-	GNUTLS_SEC_PARAM_VERY_WEAK = -12,
-	GNUTLS_SEC_PARAM_WEAK = -10,
 	GNUTLS_SEC_PARAM_UNKNOWN = 0,
-	GNUTLS_SEC_PARAM_LOW = 1,
-	GNUTLS_SEC_PARAM_LEGACY = 2,
-	GNUTLS_SEC_PARAM_NORMAL = 3,
-	GNUTLS_SEC_PARAM_HIGH = 4,
-	GNUTLS_SEC_PARAM_ULTRA = 5,
+	GNUTLS_SEC_PARAM_INSECURE = 5,
+	GNUTLS_SEC_PARAM_EXPORT = 10,
+	GNUTLS_SEC_PARAM_VERY_WEAK = 15,
+	GNUTLS_SEC_PARAM_WEAK = 20,
+	GNUTLS_SEC_PARAM_LOW = 25,
+	GNUTLS_SEC_PARAM_LEGACY = 30,
+	GNUTLS_SEC_PARAM_MEDIUM = 35,
+	GNUTLS_SEC_PARAM_HIGH = 40,
+	GNUTLS_SEC_PARAM_ULTRA = 45
 } gnutls_sec_param_t;
 
+/* old name */
+#define GNUTLS_SEC_PARAM_NORMAL GNUTLS_SEC_PARAM_MEDIUM
+
 /**
  * gnutls_channel_binding_t:
  * @GNUTLS_CB_TLS_UNIQUE: "tls-unique" (RFC 5929) channel binding
@@ -742,9 +778,6 @@ typedef struct gnutls_session_int *gnutls_session_t;
 struct gnutls_dh_params_int;
 typedef struct gnutls_dh_params_int *gnutls_dh_params_t;
 
-struct gnutls_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;
@@ -762,7 +795,6 @@ typedef struct gnutls_params_st {
 	gnutls_params_type_t type;
 	union params {
 		gnutls_dh_params_t dh;
-		gnutls_ecdh_params_t ecdh;
 		gnutls_rsa_params_t rsa_export;
 	} params;
 	int deinit;
@@ -799,9 +831,13 @@ gnutls_sec_param_t gnutls_pk_bits_to_sec_param(gnutls_pk_algorithm_t algo,
 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);
+unsigned int
+gnutls_sec_param_to_symmetric_bits(gnutls_sec_param_t param);
 
 /* Elliptic curves */
 const char *gnutls_ecc_curve_get_name(gnutls_ecc_curve_t curve);
+const char *gnutls_ecc_curve_get_oid(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);
 
@@ -824,14 +860,20 @@ int gnutls_sign_algorithm_get_requested(gnutls_session_t session,
 /* the name of the specified algorithms */
 const char *gnutls_cipher_get_name(gnutls_cipher_algorithm_t algorithm);
 const char *gnutls_mac_get_name(gnutls_mac_algorithm_t algorithm);
+
 const char *gnutls_digest_get_name(gnutls_digest_algorithm_t algorithm);
+const char *gnutls_digest_get_oid(gnutls_digest_algorithm_t algorithm);
+
 const char *gnutls_compression_get_name(gnutls_compression_method_t
 					algorithm);
 const char *gnutls_kx_get_name(gnutls_kx_algorithm_t algorithm);
 const char *gnutls_certificate_type_get_name(gnutls_certificate_type_t
 					     type);
 const char *gnutls_pk_get_name(gnutls_pk_algorithm_t algorithm);
+const char *gnutls_pk_get_oid(gnutls_pk_algorithm_t algorithm);
+
 const char *gnutls_sign_get_name(gnutls_sign_algorithm_t algorithm);
+const char *gnutls_sign_get_oid(gnutls_sign_algorithm_t algorithm);
 
 size_t gnutls_cipher_get_key_size(gnutls_cipher_algorithm_t algorithm);
 size_t gnutls_mac_get_key_size(gnutls_mac_algorithm_t algorithm);
@@ -849,6 +891,7 @@ gnutls_pk_to_sign(gnutls_pk_algorithm_t pk,
 
 gnutls_mac_algorithm_t gnutls_mac_get_id(const char *name);
 gnutls_digest_algorithm_t gnutls_digest_get_id(const char *name);
+
 gnutls_compression_method_t gnutls_compression_get_id(const char *name);
 gnutls_cipher_algorithm_t gnutls_cipher_get_id(const char *name);
 gnutls_kx_algorithm_t gnutls_kx_get_id(const char *name);
@@ -856,6 +899,12 @@ gnutls_protocol_t gnutls_protocol_get_id(const char *name);
 gnutls_certificate_type_t gnutls_certificate_type_get_id(const char *name);
 gnutls_pk_algorithm_t gnutls_pk_get_id(const char *name);
 gnutls_sign_algorithm_t gnutls_sign_get_id(const char *name);
+gnutls_ecc_curve_t gnutls_ecc_curve_get_id(const char *name);
+
+gnutls_digest_algorithm_t gnutls_oid_to_digest(const char *oid);
+gnutls_pk_algorithm_t gnutls_oid_to_pk(const char *oid);
+gnutls_sign_algorithm_t gnutls_oid_to_sign(const char *oid);
+gnutls_ecc_curve_t gnutls_oid_to_ecc_curve(const char *oid);
 
   /* list supported algorithms */
 const gnutls_ecc_curve_t *gnutls_ecc_curve_list(void);
@@ -908,6 +957,20 @@ void gnutls_record_disable_padding(gnutls_session_t session);
 void gnutls_record_cork(gnutls_session_t session);
 #define GNUTLS_RECORD_WAIT 1
 int gnutls_record_uncork(gnutls_session_t session, unsigned int flags);
+size_t gnutls_record_discard_queued(gnutls_session_t session);
+
+int
+gnutls_record_get_state(gnutls_session_t session,
+			unsigned read,
+			gnutls_datum_t *mac_key,
+			gnutls_datum_t *IV,
+			gnutls_datum_t *cipher_key,
+			unsigned char seq_number[8]);
+
+int
+gnutls_record_set_state(gnutls_session_t session,
+			unsigned read,
+			unsigned char seq_number[8]);
 
 typedef struct {
 	size_t low;
@@ -926,6 +989,16 @@ ssize_t gnutls_record_send_range(gnutls_session_t session,
 				 const gnutls_range_st * range);
 ssize_t gnutls_record_recv(gnutls_session_t session, void *data,
 			   size_t data_size);
+
+typedef struct mbuffer_st *gnutls_packet_t;
+
+ssize_t
+gnutls_record_recv_packet(gnutls_session_t session, 
+		   	  gnutls_packet_t *packet);
+
+void gnutls_packet_get(gnutls_packet_t packet, gnutls_datum_t *data, unsigned char *sequence);
+void gnutls_packet_deinit(gnutls_packet_t packet);
+
 #define gnutls_read gnutls_record_recv
 #define gnutls_write gnutls_record_send
 ssize_t gnutls_record_recv_seq(gnutls_session_t session, void *data,
@@ -940,8 +1013,7 @@ size_t gnutls_est_record_overhead_size(gnutls_protocol_t version,
 				       unsigned int flags);
 
 void gnutls_session_enable_compatibility_mode(gnutls_session_t session);
-void gnutls_record_set_max_empty_records(gnutls_session_t session,
-					 const unsigned int i);
+#define gnutls_record_set_max_empty_records(session, x)
 
 int gnutls_record_can_use_length_hiding(gnutls_session_t session);
 
@@ -960,6 +1032,10 @@ int gnutls_prf(gnutls_session_t session,
 	       int server_random_first,
 	       size_t extra_size, const char *extra,
 	       size_t outsize, char *out);
+int gnutls_prf_rfc5705(gnutls_session_t session,
+	       size_t label_size, const char *label,
+	       size_t context_size, const char *context,
+	       size_t outsize, char *out);
 
 int gnutls_prf_raw(gnutls_session_t session,
 		   size_t label_size, const char *label,
@@ -1000,15 +1076,17 @@ int gnutls_heartbeat_allowed(gnutls_session_t session, unsigned int type);
 
   /* Safe renegotiation */
 int gnutls_safe_renegotiation_status(gnutls_session_t session);
+unsigned gnutls_session_ext_master_secret_status(gnutls_session_t session);
+unsigned gnutls_session_etm_status(gnutls_session_t session);
 
 /**
  * gnutls_supplemental_data_format_type_t:
- * @GNUTLS_SUPPLEMENTAL_USER_MAPPING_DATA: Supplemental user mapping data.
+ * @GNUTLS_SUPPLEMENTAL_UNKNOWN: Unknown data format
  *
  * Enumeration of different supplemental data types (RFC 4680).
  */
 typedef enum {
-	GNUTLS_SUPPLEMENTAL_USER_MAPPING_DATA = 0
+	GNUTLS_SUPPLEMENTAL_UNKNOWN = 0,
 } gnutls_supplemental_data_format_type_t;
 
 const char
@@ -1073,6 +1151,7 @@ int gnutls_key_generate(gnutls_datum_t * key, unsigned int key_size);
 
 /* if you just want some defaults, use the following.
  */
+
 int gnutls_priority_init(gnutls_priority_t * priority_cache,
 			 const char *priorities, const char **err_pos);
 void gnutls_priority_deinit(gnutls_priority_t priority_cache);
@@ -1080,6 +1159,11 @@ int gnutls_priority_get_cipher_suite_index(gnutls_priority_t pcache,
 					   unsigned int idx,
 					   unsigned int *sidx);
 
+#define GNUTLS_PRIORITY_LIST_INIT_KEYWORDS 1
+#define GNUTLS_PRIORITY_LIST_SPECIAL 2
+const char *
+gnutls_priority_string_list(unsigned iter, unsigned int flags);
+
 int gnutls_priority_set(gnutls_session_t session,
 			gnutls_priority_t priority);
 int gnutls_priority_set_direct(gnutls_session_t session,
@@ -1192,6 +1276,7 @@ time_t gnutls_db_check_entry_time(gnutls_datum_t * entry);
    * @htype: the type of the handshake message (%gnutls_handshake_description_t)
    * @post: non zero if this is a post-process/generation call and zero otherwise
    * @incoming: non zero if this is an incoming message and zero if this is an outgoing message
+   * @msg: the (const) data of the handshake message without the handshake headers.
    *
    * Function prototype for handshake hooks. It is set using
    * gnutls_handshake_set_hook_function().
@@ -1205,7 +1290,8 @@ time_t gnutls_db_check_entry_time(gnutls_datum_t * entry);
 typedef int (*gnutls_handshake_hook_func) (gnutls_session_t,
 					   unsigned int htype,
 					   unsigned post,
-					   unsigned int incoming);
+					   unsigned int incoming,
+					   const gnutls_datum_t *msg);
 void gnutls_handshake_set_hook_function(gnutls_session_t session,
 					unsigned int htype, int post,
 					gnutls_handshake_hook_func func);
@@ -1231,6 +1317,8 @@ void gnutls_credentials_clear(gnutls_session_t session);
  */
 int gnutls_credentials_set(gnutls_session_t session,
 			   gnutls_credentials_type_t type, void *cred);
+int gnutls_credentials_get(gnutls_session_t session,
+			   gnutls_credentials_type_t type, void **cred);
 #define gnutls_cred_set	gnutls_credentials_set
 
 /* x.509 types */
@@ -1310,6 +1398,17 @@ int gnutls_certificate_get_crt_raw(gnutls_certificate_credentials_t sc,
 				   unsigned idx1, unsigned idx2,
 				   gnutls_datum_t * cert);
 
+int
+gnutls_certificate_get_x509_crt(gnutls_certificate_credentials_t res,
+                                unsigned index,
+                                gnutls_x509_crt_t **crt_list,
+                                unsigned *crt_list_size);
+
+int
+gnutls_certificate_get_x509_key(gnutls_certificate_credentials_t res,
+                                unsigned index,
+                                gnutls_x509_privkey_t *key);
+
 void gnutls_certificate_free_keys(gnutls_certificate_credentials_t sc);
 void gnutls_certificate_free_cas(gnutls_certificate_credentials_t sc);
 void gnutls_certificate_free_ca_names(gnutls_certificate_credentials_t sc);
@@ -1319,10 +1418,16 @@ void gnutls_certificate_set_dh_params(gnutls_certificate_credentials_t res,
 				      gnutls_dh_params_t dh_params);
 void gnutls_certificate_set_verify_flags(gnutls_certificate_credentials_t
 					 res, unsigned int flags);
+unsigned int
+gnutls_certificate_get_verify_flags(gnutls_certificate_credentials_t res);
+
 void gnutls_certificate_set_verify_limits(gnutls_certificate_credentials_t
 					  res, unsigned int max_bits,
 					  unsigned int max_depth);
 
+unsigned int
+gnutls_certificate_get_verify_flags(gnutls_certificate_credentials_t);
+
 int
 gnutls_certificate_set_x509_system_trust(gnutls_certificate_credentials_t
 					 cred);
@@ -1331,6 +1436,11 @@ 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_dir(gnutls_certificate_credentials_t cred,
+				      const char *ca_dir,
+				      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);
@@ -1395,6 +1505,14 @@ int gnutls_certificate_set_x509_crl(gnutls_certificate_credentials_t res,
 				    gnutls_x509_crl_t * crl_list,
 				    int crl_list_size);
 
+int gnutls_certificate_get_x509_key(gnutls_certificate_credentials_t res,
+                                    unsigned index,
+                                    gnutls_x509_privkey_t *key);
+int gnutls_certificate_get_x509_crt(gnutls_certificate_credentials_t res,
+                                    unsigned index,
+                                    gnutls_x509_crt_t **crt_list,
+                                    unsigned *crt_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);
@@ -1418,6 +1536,7 @@ int gnutls_ocsp_status_request_enable_client(gnutls_session_t session,
 int gnutls_ocsp_status_request_get(gnutls_session_t session,
 				   gnutls_datum_t * response);
 
+#define GNUTLS_OCSP_SR_IS_AVAIL 1
 int gnutls_ocsp_status_request_is_checked(gnutls_session_t session,
 					  unsigned int flags);
 
@@ -1453,23 +1572,21 @@ typedef int (*gnutls_is_secure_function) (const void *);
 typedef void (*gnutls_free_function) (void *);
 typedef void *(*gnutls_realloc_function) (void *, size_t);
 
-void
-gnutls_global_set_mem_functions(gnutls_alloc_function alloc_func,
-				gnutls_alloc_function secure_alloc_func,
-				gnutls_is_secure_function is_secure_func,
-				gnutls_realloc_function realloc_func,
-				gnutls_free_function free_func);
-
 void gnutls_global_set_time_function(gnutls_time_func time_func);
 
 /* For use in callbacks */
-extern gnutls_alloc_function gnutls_malloc;
-extern gnutls_alloc_function gnutls_secure_malloc;
-extern gnutls_realloc_function gnutls_realloc;
-extern gnutls_calloc_function gnutls_calloc;
-extern gnutls_free_function gnutls_free;
+extern _SYM_EXPORT gnutls_alloc_function gnutls_malloc;
+extern _SYM_EXPORT gnutls_realloc_function gnutls_realloc;
+extern _SYM_EXPORT gnutls_calloc_function gnutls_calloc;
+extern _SYM_EXPORT gnutls_free_function gnutls_free;
 
-extern char *(*gnutls_strdup) (const char *);
+extern _SYM_EXPORT char *(*gnutls_strdup) (const char *);
+
+/* a variant of memset that doesn't get optimized out */
+void gnutls_memset(void *data, int c, size_t size);
+
+/* constant time memcmp */
+int gnutls_memcmp(const void *s1, const void *s2, size_t n);
 
 typedef void (*gnutls_log_func) (int, const char *);
 typedef void (*gnutls_audit_log_func) (gnutls_session_t, const char *);
@@ -1484,6 +1601,10 @@ void gnutls_dh_params_deinit(gnutls_dh_params_t dh_params);
 int gnutls_dh_params_import_raw(gnutls_dh_params_t dh_params,
 				const gnutls_datum_t * prime,
 				const gnutls_datum_t * generator);
+int gnutls_dh_params_import_raw2(gnutls_dh_params_t dh_params,
+				 const gnutls_datum_t * prime,
+				 const gnutls_datum_t * generator,
+				 unsigned key_bits);
 int gnutls_dh_params_import_pkcs3(gnutls_dh_params_t params,
 				  const gnutls_datum_t * pkcs3_params,
 				  gnutls_x509_crt_fmt_t format);
@@ -1516,6 +1637,7 @@ typedef ssize_t(*gnutls_pull_func) (gnutls_transport_ptr_t, void *,
 typedef ssize_t(*gnutls_push_func) (gnutls_transport_ptr_t, const void *,
 				    size_t);
 
+int gnutls_system_recv_timeout(gnutls_transport_ptr_t ptr, unsigned int ms);
 typedef int (*gnutls_pull_timeout_func) (gnutls_transport_ptr_t,
 					 unsigned int ms);
 
@@ -1583,7 +1705,7 @@ int gnutls_fingerprint(gnutls_digest_algorithm_t algo,
    * Enumeration of different random art types.
    */
 typedef enum gnutls_random_art {
-	GNUTLS_RANDOM_ART_OPENSSH = 1,
+	GNUTLS_RANDOM_ART_OPENSSH = 1
 } gnutls_random_art_t;
 
 int gnutls_random_art(gnutls_random_art_t type,
@@ -1631,20 +1753,20 @@ int gnutls_srp_verifier(const char *username,
 /* 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 _SYM_EXPORT const gnutls_datum_t gnutls_srp_4096_group_prime;
+extern _SYM_EXPORT 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 _SYM_EXPORT const gnutls_datum_t gnutls_srp_3072_group_prime;
+extern _SYM_EXPORT const gnutls_datum_t gnutls_srp_3072_group_generator;
 
-extern const gnutls_datum_t gnutls_srp_2048_group_prime;
-extern const gnutls_datum_t gnutls_srp_2048_group_generator;
+extern _SYM_EXPORT const gnutls_datum_t gnutls_srp_2048_group_prime;
+extern _SYM_EXPORT const gnutls_datum_t gnutls_srp_2048_group_generator;
 
-extern const gnutls_datum_t gnutls_srp_1536_group_prime;
-extern const gnutls_datum_t gnutls_srp_1536_group_generator;
+extern _SYM_EXPORT const gnutls_datum_t gnutls_srp_1536_group_prime;
+extern _SYM_EXPORT const gnutls_datum_t gnutls_srp_1536_group_generator;
 
-extern const gnutls_datum_t gnutls_srp_1024_group_prime;
-extern const gnutls_datum_t gnutls_srp_1024_group_generator;
+extern _SYM_EXPORT const gnutls_datum_t gnutls_srp_1024_group_prime;
+extern _SYM_EXPORT const gnutls_datum_t gnutls_srp_1024_group_generator;
 
 typedef int gnutls_srp_server_credentials_function(gnutls_session_t,
 						   const char *username,
@@ -1670,14 +1792,23 @@ gnutls_srp_set_client_credentials_function(gnutls_srp_client_credentials_t
 
 int gnutls_srp_base64_encode(const gnutls_datum_t * data, char *result,
 			     size_t * result_size);
-int gnutls_srp_base64_encode_alloc(const gnutls_datum_t * data,
+int gnutls_srp_base64_encode2(const gnutls_datum_t * data,
 				   gnutls_datum_t * result);
 
 int gnutls_srp_base64_decode(const gnutls_datum_t * b64_data, char *result,
 			     size_t * result_size);
-int gnutls_srp_base64_decode_alloc(const gnutls_datum_t * b64_data,
+int gnutls_srp_base64_decode2(const gnutls_datum_t * b64_data,
 				   gnutls_datum_t * result);
 
+#define gnutls_srp_base64_encode_alloc gnutls_srp_base64_encode2
+#define gnutls_srp_base64_decode_alloc gnutls_srp_base64_decode2
+
+void
+gnutls_srp_set_server_fake_salt_seed(gnutls_srp_server_credentials_t
+				     sc,
+				     const gnutls_datum_t * seed,
+				     unsigned int salt_length);
+
 /* PSK stuff */
 typedef struct gnutls_psk_server_credentials_st
 *gnutls_psk_server_credentials_t;
@@ -1744,6 +1875,9 @@ int gnutls_hex_encode(const gnutls_datum_t * data, char *result,
 int gnutls_hex_decode(const gnutls_datum_t * hex_data, void *result,
 		      size_t * result_size);
 
+int gnutls_hex_encode2(const gnutls_datum_t * data, gnutls_datum_t *result);
+int gnutls_hex_decode2(const gnutls_datum_t * data, gnutls_datum_t *result);
+
 void
 gnutls_psk_set_server_dh_params(gnutls_psk_server_credentials_t res,
 				gnutls_dh_params_t dh_params);
@@ -1905,6 +2039,34 @@ int gnutls_certificate_verify_peers3(gnutls_session_t session,
 				     const char *hostname,
 				     unsigned int *status);
 
+/**
+ * gnutls_vdata_types_t:
+ * @GNUTLS_DT_UNKNOWN: Unknown data type.
+ * @GNUTLS_DT_DNS_HOSTNAME: The data contain a null-terminated DNS hostname.
+ * @GNUTLS_DT_RFC822NAME: The data contain a null-terminated email address.
+ * @GNUTLS_DT_KEY_PURPOSE_OID: The data contain a null-terminated key purpose OID.
+ *
+ * Enumeration of different key exchange algorithms.
+ */
+typedef enum {
+	GNUTLS_DT_UNKNOWN = 0,
+	GNUTLS_DT_DNS_HOSTNAME = 1,
+	GNUTLS_DT_KEY_PURPOSE_OID = 2,
+	GNUTLS_DT_RFC822NAME = 3
+} gnutls_vdata_types_t;
+
+typedef struct {
+	gnutls_vdata_types_t type;
+	unsigned char *data;
+	unsigned int size;
+} gnutls_typed_vdata_st;
+
+int
+gnutls_certificate_verify_peers(gnutls_session_t session,
+				gnutls_typed_vdata_st * data,
+				unsigned int elements,
+				unsigned int *status);
+
 int gnutls_certificate_verification_status_print(unsigned int status,
 						 gnutls_certificate_type_t
 						 type,
@@ -1917,13 +2079,16 @@ int gnutls_pem_base64_decode(const char *header,
 			     const gnutls_datum_t * b64_data,
 			     unsigned char *result, size_t * result_size);
 
-int gnutls_pem_base64_encode_alloc(const char *msg,
+int gnutls_pem_base64_encode2(const char *msg,
 				   const gnutls_datum_t * data,
 				   gnutls_datum_t * result);
-int gnutls_pem_base64_decode_alloc(const char *header,
+int gnutls_pem_base64_decode2(const char *header,
 				   const gnutls_datum_t * b64_data,
 				   gnutls_datum_t * result);
 
+#define gnutls_pem_base64_encode_alloc gnutls_pem_base64_encode2
+#define gnutls_pem_base64_decode_alloc gnutls_pem_base64_decode2
+
   /* key_usage will be an OR of the following values:
    */
 
@@ -2038,7 +2203,7 @@ typedef enum {
 	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_WRONG = (1 << 5)
 } gnutls_pin_flag_t;
 
 #define GNUTLS_PKCS11_PIN_USER GNUTLS_PIN_USER
@@ -2091,6 +2256,84 @@ void gnutls_certificate_set_pin_function(gnutls_certificate_credentials_t,
 					 gnutls_pin_callback_t fn,
 					 void *userdata);
 
+/* Public string related functions */
+typedef struct gnutls_buffer_st *gnutls_buffer_t;
+
+int gnutls_buffer_append_data(gnutls_buffer_t, const void *data, size_t data_size);
+
+/* Public extensions related functions */
+
+typedef void *gnutls_ext_priv_data_t;
+
+void gnutls_ext_set_data(gnutls_session_t session, unsigned type,
+			 gnutls_ext_priv_data_t);
+int gnutls_ext_get_data(gnutls_session_t session, unsigned type,
+			gnutls_ext_priv_data_t *);
+
+typedef int (*gnutls_ext_recv_func) (gnutls_session_t session,
+				     const unsigned char *data,
+				     size_t len);
+
+typedef int (*gnutls_ext_send_func) (gnutls_session_t session,
+				     gnutls_buffer_t extdata);
+
+typedef void (*gnutls_ext_deinit_data_func) (gnutls_ext_priv_data_t data);
+
+typedef int (*gnutls_ext_pack_func) (gnutls_ext_priv_data_t data,
+				     gnutls_buffer_t packed_data);
+
+typedef int (*gnutls_ext_unpack_func) (gnutls_buffer_t packed_data,
+				       gnutls_ext_priv_data_t *data);
+
+
+/**
+ * gnutls_ext_parse_type_t:
+ * @GNUTLS_EXT_NONE: Never parsed
+ * @GNUTLS_EXT_ANY: Any extension type.
+ * @GNUTLS_EXT_APPLICATION: Application extension.
+ * @GNUTLS_EXT_TLS: TLS-internal extension.
+ * @GNUTLS_EXT_MANDATORY: Extension parsed even if resuming (or extensions are disabled).
+ *
+ * Enumeration of different TLS extension types.  This flag
+ * indicates for an extension whether it is useful to application
+ * level or TLS level only.  This is (only) used to parse the
+ * application level extensions before the "client_hello" callback
+ * is called.
+ */
+typedef enum {
+  GNUTLS_EXT_ANY = 0,
+  GNUTLS_EXT_APPLICATION = 1,
+  GNUTLS_EXT_TLS = 2,
+  GNUTLS_EXT_MANDATORY = 3,
+  GNUTLS_EXT_NONE = 4
+} gnutls_ext_parse_type_t;
+
+	/* Register a custom tls extension
+	 */
+int gnutls_ext_register(const char *name, int type, gnutls_ext_parse_type_t parse_type,
+				gnutls_ext_recv_func recv_func, gnutls_ext_send_func send_func, 
+				gnutls_ext_deinit_data_func deinit_func, gnutls_ext_pack_func pack_func,
+				gnutls_ext_unpack_func unpack_func);
+
+/* Public supplemental data related functions */
+
+typedef int (*gnutls_supp_recv_func) (gnutls_session_t session,
+			       const unsigned char * data, size_t data_size);
+typedef int (*gnutls_supp_send_func) (gnutls_session_t session,
+			       gnutls_buffer_t buf);
+
+int gnutls_supplemental_register(const char *name, 
+				gnutls_supplemental_data_format_type_t type, 
+				gnutls_supp_recv_func supp_recv_func,
+				gnutls_supp_send_func supp_send_func);
+
+void gnutls_supplemental_recv(gnutls_session_t session, unsigned do_recv_supplemental);
+
+void gnutls_supplemental_send(gnutls_session_t session, unsigned do_send_supplemental);
+
+/* FIPS140-2 related functions */
+int gnutls_fips140_mode_enabled(void);
+
   /* Gnutls error codes. The mapping to a TLS alert is also shown in
    * comments.
    */
@@ -2221,7 +2464,8 @@ void gnutls_certificate_set_pin_function(gnutls_certificate_credentials_t,
 
 #define GNUTLS_E_OPENPGP_SUBKEY_ERROR -208
 
-#define GNUTLS_E_CRYPTO_ALREADY_REGISTERED -209
+#define GNUTLS_E_CRYPTO_ALREADY_REGISTERED GNUTLS_E_ALREADY_REGISTERED
+#define GNUTLS_E_ALREADY_REGISTERED -209
 
 #define GNUTLS_E_HANDSHAKE_TOO_LARGE -210
 
@@ -2232,6 +2476,7 @@ void gnutls_certificate_set_pin_function(gnutls_certificate_credentials_t,
 #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_INSUFFICIENT_SECURITY -217
 
 #define GNUTLS_E_HEARTBEAT_PONG_RECEIVED -292
 #define GNUTLS_E_HEARTBEAT_PING_RECEIVED -293
@@ -2274,12 +2519,24 @@ void gnutls_certificate_set_pin_function(gnutls_certificate_credentials_t,
 #define GNUTLS_E_TPM_SESSION_ERROR -332
 #define GNUTLS_E_TPM_KEY_NOT_FOUND -333
 #define GNUTLS_E_TPM_UNINITIALIZED -334
+#define GNUTLS_E_TPM_NO_LIB -335
 
 #define GNUTLS_E_NO_CERTIFICATE_STATUS -340
 #define GNUTLS_E_OCSP_RESPONSE_ERROR -341
 #define GNUTLS_E_RANDOM_DEVICE_ERROR -342
 #define GNUTLS_E_AUTH_ERROR -343
 #define GNUTLS_E_NO_APPLICATION_PROTOCOL -344
+#define GNUTLS_E_SOCKETS_INIT_ERROR -345
+#define GNUTLS_E_KEY_IMPORT_FAILED -346
+#define GNUTLS_E_INAPPROPRIATE_FALLBACK -347 /*GNUTLS_A_INAPPROPRIATE_FALLBACK*/
+
+#define GNUTLS_E_SELF_TEST_ERROR -400
+#define GNUTLS_E_NO_SELF_TEST -401
+#define GNUTLS_E_LIB_IN_ERROR_STATE -402
+#define GNUTLS_E_PK_GENERATION_ERROR -403
+#define GNUTLS_E_IDNA_ERROR -404
+
+#define GNUTLS_E_NEED_FALLBACK -405
 
 #define GNUTLS_E_UNIMPLEMENTED_FEATURE -1250