project: Update for 3.8.4 merge.

ShiftMediaProject · Apr 6, 2024 · 07a53d5 · 07a53d5
1 parent c1a71cf
commit 07a53d5
Show file tree

Hide file tree

Showing 9 changed files with 31 additions and 10 deletions.
diff --git a/SMP/SMP.patch b/SMP/SMP.patch
@@ -87,10 +87,10 @@ index 51c4891d5..da8683cc2 100644
  	switch (type) {
  	case BINDER_EXT:
 diff --git a/lib/global.c b/lib/global.c
-index 924ec945d..ae7a40a0a 100644
+index 718740c10..fdd331940 100644
 --- a/lib/global.c
 +++ b/lib/global.c
-@@ -495,7 +495,8 @@ const char *gnutls_check_version(const char *req_version)
+@@ -497,7 +497,8 @@ const char *gnutls_check_version(const char *req_version)
  	return NULL;
  }
 
@@ -100,7 +100,7 @@ index 924ec945d..ae7a40a0a 100644
  {
  	int ret;
  	const char *e;
-@@ -527,7 +528,8 @@ static void _CONSTRUCTOR lib_init(void)
+@@ -529,7 +530,8 @@ static void _CONSTRUCTOR lib_init(void)
  	}
  }
 
@@ -111,7 +111,7 @@ index 924ec945d..ae7a40a0a 100644
  	int ret;
  	const char *e;
 diff --git a/lib/includes/gnutls/gnutls.h.in b/lib/includes/gnutls/gnutls.h.in
-index 53164d0a2..05e6e078c 100644
+index e31aad3a0..66fe3789d 100644
 --- a/lib/includes/gnutls/gnutls.h.in
 +++ b/lib/includes/gnutls/gnutls.h.in
 @@ -37,7 +37,13 @@

diff --git a/SMP/config.h b/SMP/config.h
@@ -846,6 +846,9 @@ don't. */
 /* 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 `ac_cv_func_nettle_rsa_oaep_sha256_encrypt' function. */
+#define HAVE_NETTLE_RSA_OAEP_SHA256_ENCRYPT 1
+
 /* Define to 1 if you have the `nanosleep' function. */
 /* #undef HAVE_NANOSLEEP */
 

diff --git a/SMP/gnutls/gnutls.h b/SMP/gnutls/gnutls.h
@@ -55,14 +55,14 @@ typedef SSIZE_T ssize_t;
 extern "C" {
 #endif
 
-#define GNUTLS_VERSION "3.8.3"
+#define GNUTLS_VERSION "3.8.4"
 
 /* clang-format off */
 #define GNUTLS_VERSION_MAJOR 3
 #define GNUTLS_VERSION_MINOR 8
-#define GNUTLS_VERSION_PATCH 3
+#define GNUTLS_VERSION_PATCH 4
 
-#define GNUTLS_VERSION_NUMBER 0x030803
+#define GNUTLS_VERSION_NUMBER 0x030804
 /* clang-format on */
 
 #define GNUTLS_CIPHER_RIJNDAEL_128_CBC GNUTLS_CIPHER_AES_128_CBC
@@ -882,6 +882,7 @@ typedef enum gnutls_certificate_print_formats {
  * gnutls_pk_algorithm_t:
  * @GNUTLS_PK_UNKNOWN: Unknown public-key algorithm.
  * @GNUTLS_PK_RSA: RSA public-key algorithm.
+ * @GNUTLS_PK_RSA_OAEP: RSA public-key algorithm, with OAEP padding.
  * @GNUTLS_PK_RSA_PSS: RSA public-key algorithm, with PSS padding.
  * @GNUTLS_PK_DSA: DSA public-key algorithm.
  * @GNUTLS_PK_DH: Diffie-Hellman algorithm. Used to generate parameters.
@@ -910,7 +911,8 @@ typedef enum {
 	GNUTLS_PK_GOST_12_512 = 10,
 	GNUTLS_PK_ECDH_X448 = 11,
 	GNUTLS_PK_EDDSA_ED448 = 12,
-	GNUTLS_PK_MAX = GNUTLS_PK_EDDSA_ED448
+	GNUTLS_PK_RSA_OAEP = 13,
+	GNUTLS_PK_MAX = GNUTLS_PK_RSA_OAEP
 } gnutls_pk_algorithm_t;
 
 const char *gnutls_pk_algorithm_get_name(gnutls_pk_algorithm_t algorithm);

diff --git a/SMP/lib/gnutls_asn1_tab.c b/SMP/lib/gnutls_asn1_tab.c
@@ -92,6 +92,13 @@ const asn1_static_node gnutls_asn1_tab[] = {
   { "trailerField", 536911875, NULL },
   { NULL, 1073741833, "1"},
   { NULL, 2056, "3"},
+  { "RSAOAEPParameters", 1610612741, NULL },
+  { "hashAlgorithm", 1610637314, "AlgorithmIdentifier"},
+  { NULL, 2056, "0"},
+  { "maskGenAlgorithm", 1610637314, "AlgorithmIdentifier"},
+  { NULL, 2056, "1"},
+  { "pSourceFunc", 536895490, "AlgorithmIdentifier"},
+  { NULL, 2056, "2"},
   { "GOSTParameters", 1610612741, NULL },
   { "publicKeyParamSet", 1073741836, NULL },
   { "digestParamSet", 16396, NULL },

diff --git a/SMP/libgnutls.def b/SMP/libgnutls.def
@@ -1191,8 +1191,10 @@ gnutls_x509_rdn_get
 gnutls_x509_rdn_get_by_oid
 gnutls_x509_rdn_get_oid
 gnutls_x509_spki_deinit
+gnutls_x509_spki_get_rsa_oaep_params
 gnutls_x509_spki_get_rsa_pss_params
 gnutls_x509_spki_init
+gnutls_x509_spki_set_rsa_oaep_params
 gnutls_x509_spki_set_rsa_pss_params
 gnutls_x509_tlsfeatures_add
 gnutls_x509_tlsfeatures_check_crt

diff --git a/SMP/libgnutls.vcxproj.filters b/SMP/libgnutls.vcxproj.filters
@@ -612,6 +612,9 @@
     <ClInclude Include="..\lib\pathbuf.h">
       <Filter>Header Files\lib</Filter>
     </ClInclude>
+    <ClInclude Include="..\lib\nettle\int\rsa-oaep.h">
+      <Filter>Header Files\lib\nettle\int</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\lib\x509\pkcs7.c">

diff --git a/SMP/libgnutls_files.props b/SMP/libgnutls_files.props
@@ -109,6 +109,7 @@
     <ClInclude Include="..\lib\nettle\int\ecdsa-compute-k.h" />
     <ClInclude Include="..\lib\nettle\int\mpn-base256.h" />
     <ClInclude Include="..\lib\nettle\int\rsa-fips.h" />
+    <ClInclude Include="..\lib\nettle\int\rsa-oaep.h" />
     <ClInclude Include="..\lib\nettle\int\tls1-prf.h" />
     <ClInclude Include="..\lib\nettle\gost\hmac-gost.h" />
     <ClInclude Include="..\lib\nettle\gost\magma.h" />

diff --git a/SMP/libgnutls_winrt.vcxproj.filters b/SMP/libgnutls_winrt.vcxproj.filters
@@ -612,6 +612,9 @@
     <ClInclude Include="..\lib\pathbuf.h">
       <Filter>Header Files\lib</Filter>
     </ClInclude>
+    <ClInclude Include="..\lib\nettle\int\rsa-oaep.h">
+      <Filter>Header Files\lib\nettle\int</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\lib\x509\pkcs7.c">

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.8.3"
+#define PACKAGE_VERSION "3.8.4"
 
 /* Version number of package */
-#define VERSION "3.8.3"
+#define VERSION "3.8.4"