project: Update for 3.7.2 merge.

SMP/SMP.patch

@@ -89,10 +89,10 @@ index 166dd61ca..2c391feba 100644
  	_gnutls_debug_log("Vector: length: %d\n\t%s%s\n", (int) a_size,
  			  prefix, _gnutls_bin2hex(a, a_size, buf_hex,
 diff --git a/lib/global.c b/lib/global.c
-index 9a65d114c..46d2b1a4f 100644
+index 373141883..1b0158d4b 100644
 --- a/lib/global.c
 +++ b/lib/global.c
-@@ -46,11 +46,32 @@
+@@ -47,11 +47,32 @@
  #ifdef __sun
  # pragma fini(lib_deinit)
  # pragma init(lib_init)
@@ -129,28 +129,28 @@ index 9a65d114c..46d2b1a4f 100644
  #endif
 
  #ifndef _WIN32
-@@ -493,7 +514,8 @@ const char *gnutls_check_version(const char *req_version)
+@@ -485,7 +506,8 @@ const char *gnutls_check_version(const char *req_version)
  	return NULL;
  }
 
 -static void _CONSTRUCTOR lib_init(void)
 +CONSTRUCTOR_ATTRIBUTE(lib_init);
 +static void lib_init(void)
  {
- int ret;
- const char *e;
-@@ -515,7 +537,8 @@ const char *e;
+ 	int ret;
+ 	const char *e;
+@@ -515,7 +537,8 @@ static void _CONSTRUCTOR lib_init(void)
  	}
  }
 
 -static void _DESTRUCTOR lib_deinit(void)
 +DESTRUCTOR_ATTRIBUTE(lib_deinit);
 +static void lib_deinit(void)
  {
+ 	int ret;
  	const char *e;
-
 diff --git a/lib/includes/gnutls/gnutls.h.in b/lib/includes/gnutls/gnutls.h.in
-index b3f7185e9..86c74164a 100644
+index d69b29b44..d5e34bf27 100644
 --- a/lib/includes/gnutls/gnutls.h.in
 +++ b/lib/includes/gnutls/gnutls.h.in
 @@ -37,7 +37,12 @@

SMP/gnulib/lib/unictype.h

@@ -1,5 +1,5 @@
 /* Unicode character classification and properties.
-   Copyright (C) 2002, 2005-2020 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2005-2021 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify it
    under the terms of the GNU Lesser General Public License as published

SMP/gnulib/lib/uninorm.h

@@ -1,5 +1,5 @@
 /* Normalization forms (composition and decomposition) of Unicode strings.
-   Copyright (C) 2001-2002, 2009-2020 Free Software Foundation, Inc.
+   Copyright (C) 2001-2002, 2009-2021 Free Software Foundation, Inc.
    Written by Bruno Haible <[email protected]>, 2009.
 
    This program is free software: you can redistribute it and/or modify it

SMP/gnulib/lib/unistr.h

@@ -1,5 +1,5 @@
 /* Elementary Unicode string functions.
-   Copyright (C) 2001-2002, 2005-2020 Free Software Foundation, Inc.
+   Copyright (C) 2001-2002, 2005-2021 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify it
    under the terms of the GNU Lesser General Public License as published

SMP/gnulib/lib/unitypes.h

@@ -1,5 +1,5 @@
 /* Elementary types and macros for the GNU UniString library.
-   Copyright (C) 2002, 2005-2006, 2009-2020 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2005-2006, 2009-2021 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify it
    under the terms of the GNU Lesser General Public License as published

SMP/gnutls/gnutls.h

@@ -56,13 +56,13 @@ extern "C" {
 #endif
 /* *INDENT-ON* */
 
-#define GNUTLS_VERSION "3.7.1"
+#define GNUTLS_VERSION "3.7.2"
 
 #define GNUTLS_VERSION_MAJOR 3
 #define GNUTLS_VERSION_MINOR 7
-#define GNUTLS_VERSION_PATCH 1
+#define GNUTLS_VERSION_PATCH 2
 
-#define GNUTLS_VERSION_NUMBER 0x030701
+#define GNUTLS_VERSION_NUMBER 0x030702
 
 #define GNUTLS_CIPHER_RIJNDAEL_128_CBC GNUTLS_CIPHER_AES_128_CBC
 #define GNUTLS_CIPHER_RIJNDAEL_256_CBC GNUTLS_CIPHER_AES_256_CBC
@@ -450,7 +450,9 @@ typedef enum {
  *   finish; similarly to false start the handshake will be completed once data are received by the
  *   client, while the server is able to transmit sooner. This is not enabled by default as it could
  *   break certain existing server assumptions and use-cases. Since 3.6.4.
- * @GNUTLS_ENABLE_EARLY_DATA: Under TLS1.3 allow the server to receive early data sent as part of the initial ClientHello (0-RTT). This is not enabled by default as early data has weaker security properties than other data. Since 3.6.5.
+ * @GNUTLS_ENABLE_EARLY_DATA: Under TLS1.3 allow the server to receive early data sent as part of the initial ClientHello (0-RTT).
+ *   This can also be used to explicitly indicate that the client will send early data.
+ *   This is not enabled by default as early data has weaker security properties than other data. Since 3.6.5.
  * @GNUTLS_FORCE_CLIENT_CERT: When in client side and only a single cert is specified, send that certificate irrespective of the issuers expected by the server. Since 3.5.0.
  * @GNUTLS_NO_TICKETS: Flag to indicate that the session should not use resumption with session tickets.
  * @GNUTLS_KEY_SHARE_TOP3: Generate key shares for the top-3 different groups which are enabled.
@@ -480,11 +482,10 @@ typedef enum {
  *    since gnutls_record_recv() could be interrupted when sending when this flag is enabled.
  *    Note this flag may not be used if you are using the same session for sending and receiving
  *    in different threads.
- * @GNUTLS_ENABLE_EARLY_DATA: Under TLS1.3 allow the server to receive early data sent as part of the initial ClientHello (0-RTT). 
- *    This is not enabled by default as early data has weaker security properties than other data. Since 3.6.5.
  * @GNUTLS_ENABLE_RAWPK: Allows raw public-keys to be negotiated during the handshake. Since 3.6.6.
  * @GNUTLS_NO_AUTO_SEND_TICKET: Under TLS1.3 disable auto-sending of
  *    session tickets during the handshake.
+ * @GNUTLS_NO_END_OF_EARLY_DATA: Under TLS1.3 suppress sending EndOfEarlyData message. Since 3.7.2.
  *
  * Enumeration of different flags for gnutls_init() function. All the flags
  * can be combined except @GNUTLS_SERVER and @GNUTLS_CLIENT which are mutually
@@ -516,7 +517,8 @@ typedef enum {
 	GNUTLS_ENABLE_RAWPK = (1<<18),
 	GNUTLS_AUTO_REAUTH = (1<<19),
 	GNUTLS_ENABLE_EARLY_DATA = (1<<20),
-	GNUTLS_NO_AUTO_SEND_TICKET = (1<<21)
+	GNUTLS_NO_AUTO_SEND_TICKET = (1<<21),
+	GNUTLS_NO_END_OF_EARLY_DATA = (1<<22)
 } gnutls_init_flags_t;
 
 /* compatibility defines (previous versions of gnutls
@@ -1163,11 +1165,15 @@ typedef enum {
 /**
  * gnutls_channel_binding_t:
  * @GNUTLS_CB_TLS_UNIQUE: "tls-unique" (RFC 5929) channel binding
+ * @GNUTLS_CB_TLS_SERVER_END_POINT: "tls-server-end-point" (RFC 5929) channel binding
+ * @GNUTLS_CB_TLS_EXPORTER: "tls-exporter" (draft-ietf-kitten-tls-channel-bindings-for-tls13-03)
  *
- * Enumeration of support channel binding types.
+ * Enumeration of supported channel binding types.
  */
 typedef enum {
-	GNUTLS_CB_TLS_UNIQUE
+	GNUTLS_CB_TLS_UNIQUE,
+	GNUTLS_CB_TLS_SERVER_END_POINT,
+	GNUTLS_CB_TLS_EXPORTER
 } gnutls_channel_binding_t;
 
 /**
@@ -1298,14 +1304,17 @@ gnutls_group_t gnutls_group_get(gnutls_session_t session);
 
 /* get information on the current session */
 gnutls_cipher_algorithm_t gnutls_cipher_get(gnutls_session_t session);
+gnutls_cipher_algorithm_t gnutls_early_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_digest_algorithm_t gnutls_prf_hash_get(const gnutls_session_t session);
+gnutls_digest_algorithm_t
+gnutls_early_prf_hash_get(const gnutls_session_t session);
 gnutls_certificate_type_t
 gnutls_certificate_type_get(gnutls_session_t session);
 gnutls_certificate_type_t
 gnutls_certificate_type_get2(gnutls_session_t session,
-								gnutls_ctype_target_t target);
+			     gnutls_ctype_target_t target);
 
 int gnutls_sign_algorithm_get(gnutls_session_t session);
 int gnutls_sign_algorithm_get_client(gnutls_session_t session);