project: Update for 3.8.2 merge.

SMP/SMP.patch

@@ -6,11 +6,11 @@ index 41d5dae3b..3639c57a9 160000
 -Subproject commit 41d5dae3b7d239f167f09e4398f3970845a0ddc0
 +Subproject commit 3639c57a970191e0bf7a9789bd1341786d0255a1
 diff --git a/lib/accelerated/x86/x86-common.c b/lib/accelerated/x86/x86-common.c
-index a7047a7ba..b680fb425 100644
+index 3b779865e..6bd1bcb1b 100644
 --- a/lib/accelerated/x86/x86-common.c
 +++ b/lib/accelerated/x86/x86-common.c
 @@ -40,6 +40,35 @@
- #include <aes-padlock.h>
+ #include "aes-padlock.h"
  #ifdef HAVE_CPUID_H
  #include <cpuid.h>
 +#elif defined(_MSC_VER)
@@ -46,7 +46,7 @@ index a7047a7ba..b680fb425 100644
  #define __get_cpuid(...) 0
  #define __get_cpuid_count(...) 0
 diff --git a/lib/debug.c b/lib/debug.c
-index cb1b0ca59..ca07941c6 100644
+index 53a142cf5..64bdec841 100644
 --- a/lib/debug.c
 +++ b/lib/debug.c
 @@ -31,7 +31,11 @@
@@ -74,7 +74,7 @@ index cb1b0ca59..ca07941c6 100644
  	_gnutls_debug_log("Vector: length: %d\n\t%s%s\n", (int)a_size, prefix,
  			  _gnutls_bin2hex(a, a_size, buf_hex, sizeof(buf_hex),
 diff --git a/lib/ext/pre_shared_key.c b/lib/ext/pre_shared_key.c
-index f632f972b..19d2ec935 100644
+index 51c4891d5..da8683cc2 100644
 --- a/lib/ext/pre_shared_key.c
 +++ b/lib/ext/pre_shared_key.c
 @@ -80,7 +80,7 @@ static const char *get_binder_label(enum binder_type type, size_t *size)
@@ -87,7 +87,7 @@ index f632f972b..19d2ec935 100644
  	switch (type) {
  	case BINDER_EXT:
 diff --git a/lib/global.c b/lib/global.c
-index 0bc249685..007eacdb2 100644
+index 924ec945d..ae7a40a0a 100644
 --- a/lib/global.c
 +++ b/lib/global.c
 @@ -495,7 +495,8 @@ const char *gnutls_check_version(const char *req_version)
@@ -111,7 +111,7 @@ index 0bc249685..007eacdb2 100644
  	int ret;
  	const char *e;
 diff --git a/lib/includes/gnutls/gnutls.h.in b/lib/includes/gnutls/gnutls.h.in
-index ec132cb5c..c858c4c7b 100644
+index 53164d0a2..05e6e078c 100644
 --- a/lib/includes/gnutls/gnutls.h.in
 +++ b/lib/includes/gnutls/gnutls.h.in
 @@ -37,7 +37,13 @@
@@ -130,7 +130,7 @@ index ec132cb5c..c858c4c7b 100644
  /* Get size_t. */
  #include <stddef.h>
 diff --git a/lib/system/fastopen.c b/lib/system/fastopen.c
-index 436922314..66b0b5563 100644
+index 7132a0817..f62907966 100644
 --- a/lib/system/fastopen.c
 +++ b/lib/system/fastopen.c
 @@ -26,7 +26,9 @@
@@ -144,13 +144,13 @@ index 436922314..66b0b5563 100644
  #include <sys/stat.h>
  #include <sys/types.h>
 diff --git a/lib/x509/hostname-verify.c b/lib/x509/hostname-verify.c
-index 331161389..a62d1c10c 100644
+index 04e17aa23..fd66d24f8 100644
 --- a/lib/x509/hostname-verify.c
 +++ b/lib/x509/hostname-verify.c
 @@ -26,8 +26,10 @@
- #include <common.h>
+ #include "common.h"
  #include "errors.h"
- #include <system.h>
+ #include "system.h"
 +#ifndef _MSC_VER
  #include <netinet/in.h>
  #include <arpa/inet.h>
@@ -173,7 +173,7 @@ index 536b75c10..8ff65b992 100644
  /*-
   * _gnutls_mask_to_prefix:
 diff --git a/lib/x509/verify-high2.c b/lib/x509/verify-high2.c
-index ada486045..d8c64ff54 100644
+index 9fd73e487..3c494c85a 100644
 --- a/lib/x509/verify-high2.c
 +++ b/lib/x509/verify-high2.c
 @@ -465,7 +465,9 @@ static int load_dir_certs(const char *dirname, gnutls_x509_trust_list_t list,
@@ -187,7 +187,7 @@ index ada486045..d8c64ff54 100644
  			default:
  				continue;
 diff --git a/lib/x509/x509_ext.c b/lib/x509/x509_ext.c
-index 49314869c..847218aa2 100644
+index ad3af1430..ba373e582 100644
 --- a/lib/x509/x509_ext.c
 +++ b/lib/x509/x509_ext.c
 @@ -3539,7 +3539,7 @@ static const struct sct_sign_algorithm_st algos[] = {

SMP/config.h

@@ -843,6 +843,9 @@ don't. */
 /* Define to 1 if you have the `nettle_streebog512_update' function. */
 #define HAVE_NETTLE_STREEBOG512_UPDATE 1
 
+/* Define to 1 if you have the `nettle_siv_gcm_encrypt_message' function. */
+#define HAVE_NETTLE_SIV_GCM_ENCRYPT_MESSAGE 1
+
 /* Define to 1 if you have the `nanosleep' function. */
 /* #undef HAVE_NANOSLEEP */
 

SMP/gnutls/gnutls.h

@@ -38,11 +38,11 @@
 
 /* Get ssize_t. */
 #ifdef _MSC_VER
-#include <BaseTsd.h>
+#  include <BaseTsd.h>
 typedef SSIZE_T ssize_t;
-#include <sys/types.h>
+#  include <sys/types.h>
 #else
-#include <sys/types.h>
+#  include <sys/types.h>
 #endif
 
 /* Get size_t. */
@@ -55,14 +55,14 @@ typedef SSIZE_T ssize_t;
 extern "C" {
 #endif
 
-#define GNUTLS_VERSION "3.8.1"
+#define GNUTLS_VERSION "3.8.2"
 
 /* clang-format off */
 #define GNUTLS_VERSION_MAJOR 3
 #define GNUTLS_VERSION_MINOR 8
-#define GNUTLS_VERSION_PATCH 1
+#define GNUTLS_VERSION_PATCH 2
 
-#define GNUTLS_VERSION_NUMBER 0x030801
+#define GNUTLS_VERSION_NUMBER 0x030802
 /* clang-format on */
 
 #define GNUTLS_CIPHER_RIJNDAEL_128_CBC GNUTLS_CIPHER_AES_128_CBC
@@ -154,6 +154,8 @@ extern "C" {
  *                             the authentication tag while it is prepended to
  *                             the cipher text.
  * @GNUTLS_CIPHER_AES_192_GCM: AES in GCM mode with 192-bit keys (AEAD).
+ * @GNUTLS_CIPHER_AES_128_SIV_GCM: AES in SIV-GCM mode with 128-bit key.
+ * @GNUTLS_CIPHER_AES_256_SIV_GCM: AES in SIV-GCM mode with 256-bit key.
  *
  * Enumeration of different symmetric encryption algorithms.
  */
@@ -200,6 +202,8 @@ typedef enum gnutls_cipher_algorithm {
 	GNUTLS_CIPHER_AES_192_GCM = 39,
 	GNUTLS_CIPHER_MAGMA_CTR_ACPKM = 40,
 	GNUTLS_CIPHER_KUZNYECHIK_CTR_ACPKM = 41,
+	GNUTLS_CIPHER_AES_128_SIV_GCM = 42,
+	GNUTLS_CIPHER_AES_256_SIV_GCM = 43,
 
 	/* used only for PGP internals. Ignored in TLS/SSL
 	 */
@@ -469,7 +473,7 @@ typedef enum {
  *   For example (ECDH + x25519). This is the default.
  * @GNUTLS_KEY_SHARE_TOP: Generate key share for the first group which is enabled.
  *   For example x25519. This option is the most performant for client (less CPU spent
- *   generating keys), but if the server doesn't support the advertized option it may
+ *   generating keys), but if the server doesn't support the advertised option it may
  *   result to more roundtrips needed to discover the server's choice.
  * @GNUTLS_NO_AUTO_REKEY: Disable auto-rekeying under TLS1.3. If this option is not specified
  *   gnutls will force a rekey after 2^24 records have been sent.
@@ -548,6 +552,9 @@ typedef enum {
 #define GNUTLS_ENABLE_CERT_TYPE_NEG 0
 // Here for compatibility reasons
 
+/* Keep backward compatibility */
+#define GNUTLS_NO_EXTENSIONS GNUTLS_NO_DEFAULT_EXTENSIONS
+
 /**
  * gnutls_alert_level_t:
  * @GNUTLS_AL_WARNING: Alert of warning severity.

SMP/libgnutls.def

@@ -555,6 +555,8 @@ gnutls_priority_string_list
 gnutls_privkey_decrypt_data2
 gnutls_privkey_decrypt_data
 gnutls_privkey_deinit
+gnutls_privkey_derive_secret
+gnutls_privkey_export_dh_raw
 gnutls_privkey_export_dsa_raw2
 gnutls_privkey_export_dsa_raw
 gnutls_privkey_export_ecc_raw2
@@ -570,6 +572,7 @@ gnutls_privkey_get_pk_algorithm
 gnutls_privkey_get_seed
 gnutls_privkey_get_spki
 gnutls_privkey_get_type
+gnutls_privkey_import_dh_raw
 gnutls_privkey_import_dsa_raw
 gnutls_privkey_import_ecc_raw
 gnutls_privkey_import_ext2
@@ -627,6 +630,7 @@ gnutls_pubkey_deinit
 gnutls_pubkey_encrypt_data
 gnutls_pubkey_export2
 gnutls_pubkey_export
+gnutls_pubkey_export_dh_raw
 gnutls_pubkey_export_dsa_raw2
 gnutls_pubkey_export_dsa_raw
 gnutls_pubkey_export_ecc_raw2
@@ -642,6 +646,7 @@ gnutls_pubkey_get_pk_algorithm
 gnutls_pubkey_get_preferred_hash_algorithm
 gnutls_pubkey_get_spki
 gnutls_pubkey_import
+gnutls_pubkey_import_dh_raw
 gnutls_pubkey_import_dsa_raw
 gnutls_pubkey_import_ecc_raw
 gnutls_pubkey_import_ecc_x962
@@ -1164,6 +1169,7 @@ gnutls_x509_privkey_get_seed
 gnutls_x509_privkey_get_spki
 gnutls_x509_privkey_import2
 gnutls_x509_privkey_import
+gnutls_x509_privkey_import_dh_raw
 gnutls_x509_privkey_import_dsa_raw
 gnutls_x509_privkey_import_ecc_raw
 gnutls_x509_privkey_import_gost_raw

SMP/version.h

@@ -1,5 +1,5 @@
 /* Define to the version of this package. */
-#define PACKAGE_VERSION "3.8.1"
+#define PACKAGE_VERSION "3.8.2"
 
 /* Version number of package */
-#define VERSION "3.8.1"
+#define VERSION "3.8.2"