project: Update for 3.7.7 merge.

ShiftMediaProject · Sep 2, 2022 · 4023ab1 · 4023ab1
1 parent de81320
commit 4023ab1
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 9 deletions.
diff --git a/SMP/SMP.patch b/SMP/SMP.patch
@@ -89,7 +89,7 @@ index 991f7a7be..6d468674a 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 faa7f0afb..6f6c74713 100644
+index 1b372c15b..a77ea054f 100644
 --- a/lib/global.c
 +++ b/lib/global.c
 @@ -47,11 +47,32 @@
@@ -129,7 +129,7 @@ index faa7f0afb..6f6c74713 100644
  #endif
 
  #ifndef _WIN32
-@@ -476,7 +497,8 @@ const char *gnutls_check_version(const char *req_version)
+@@ -482,7 +503,8 @@ const char *gnutls_check_version(const char *req_version)
  	return NULL;
  }
 
@@ -139,7 +139,7 @@ index faa7f0afb..6f6c74713 100644
  {
  	int ret;
  	const char *e;
-@@ -506,7 +528,8 @@ static void _CONSTRUCTOR lib_init(void)
+@@ -512,7 +534,8 @@ static void _CONSTRUCTOR lib_init(void)
  	}
  }
 
@@ -150,7 +150,7 @@ index faa7f0afb..6f6c74713 100644
  	int ret;
  	const char *e;
 diff --git a/lib/includes/gnutls/gnutls.h.in b/lib/includes/gnutls/gnutls.h.in
-index f7fc5d114..174905988 100644
+index 5840f331e..bbf932f60 100644
 --- a/lib/includes/gnutls/gnutls.h.in
 +++ b/lib/includes/gnutls/gnutls.h.in
 @@ -37,7 +37,13 @@

diff --git a/SMP/gnutls/gnutls.h b/SMP/gnutls/gnutls.h
@@ -57,13 +57,13 @@ extern "C" {
 #endif
 /* *INDENT-ON* */
 
-#define GNUTLS_VERSION "3.7.6"
+#define GNUTLS_VERSION "3.7.7"
 
 #define GNUTLS_VERSION_MAJOR 3
 #define GNUTLS_VERSION_MINOR 7
-#define GNUTLS_VERSION_PATCH 6
+#define GNUTLS_VERSION_PATCH 7
 
-#define GNUTLS_VERSION_NUMBER 0x030706
+#define GNUTLS_VERSION_NUMBER 0x030707
 
 #define GNUTLS_CIPHER_RIJNDAEL_128_CBC GNUTLS_CIPHER_AES_128_CBC
 #define GNUTLS_CIPHER_RIJNDAEL_256_CBC GNUTLS_CIPHER_AES_256_CBC
@@ -3425,6 +3425,8 @@ gnutls_fips140_get_operation_state(gnutls_fips140_context_t context);
 int gnutls_fips140_push_context(gnutls_fips140_context_t context);
 int gnutls_fips140_pop_context(void);
 
+int gnutls_fips140_run_self_tests(void);
+
   /* Gnutls error codes. The mapping to a TLS alert is also shown in
    * comments.
    */

diff --git a/SMP/libgnutls.def b/SMP/libgnutls.def
@@ -116,9 +116,11 @@ gnutls_certificate_verify_peers
 gnutls_check_version
 gnutls_cipher_add_auth
 gnutls_cipher_decrypt2
+gnutls_cipher_decrypt3
 gnutls_cipher_decrypt
 gnutls_cipher_deinit
 gnutls_cipher_encrypt2
+gnutls_cipher_encrypt3
 gnutls_cipher_encrypt
 gnutls_cipher_get
 gnutls_cipher_get_block_size
@@ -244,6 +246,7 @@ gnutls_fips140_get_operation_state
 gnutls_fips140_mode_enabled
 gnutls_fips140_pop_context
 gnutls_fips140_push_context
+gnutls_fips140_run_self_tests
 gnutls_fips140_set_mode
 gnutls_free
 gnutls_get_library_config

diff --git a/SMP/smp_winrt_deps.props b/SMP/smp_winrt_deps.props
@@ -63,6 +63,7 @@
     <ApplicationTypeRevision Condition="'$(VisualStudioVersion)' == '12.0'">8.1</ApplicationTypeRevision>
     <WindowsTargetPlatformVersion Condition="'$(ApplicationTypeRevision)|$(WindowsTargetPlatformVersion)' == '10.0|'">10.0.10240.0</WindowsTargetPlatformVersion>
     <WindowsTargetPlatformMinVersion Condition="'$(ApplicationTypeRevision)' == '10.0'">10.0.10240.0</WindowsTargetPlatformMinVersion>
+    <TargetPlatformMinVersion Condition="'$(ApplicationTypeRevision)' == '10.0'">10.0.10240.0</TargetPlatformMinVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugWinRT|Win32'" Label="Configuration">

diff --git a/SMP/version.h b/SMP/version.h
@@ -1,5 +1,5 @@
 /* Define to the version of this package. */
-#define PACKAGE_VERSION "3.7.6"
+#define PACKAGE_VERSION "3.7.7"
 
 /* Version number of package */
-#define VERSION "3.7.6"
+#define VERSION "3.7.7"