project: Update for 3.5.10 merge.

ShiftMediaProject · Mar 12, 2017 · 0c88bb0 · 0c88bb0
1 parent ccf840b
commit 0c88bb0
Show file tree

Hide file tree

Showing 4 changed files with 137 additions and 125 deletions.
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.5.9"
+#define GNUTLS_VERSION "3.5.10"
 
 #define GNUTLS_VERSION_MAJOR 3
 #define GNUTLS_VERSION_MINOR 5
-#define GNUTLS_VERSION_PATCH 9
+#define GNUTLS_VERSION_PATCH 10
 
-#define GNUTLS_VERSION_NUMBER 0x030509
+#define GNUTLS_VERSION_NUMBER 0x03050a
 
 #define GNUTLS_CIPHER_RIJNDAEL_128_CBC GNUTLS_CIPHER_AES_128_CBC
 #define GNUTLS_CIPHER_RIJNDAEL_256_CBC GNUTLS_CIPHER_AES_256_CBC
@@ -1887,10 +1887,9 @@ int gnutls_dh_params_cpy(gnutls_dh_params_t dst, gnutls_dh_params_t src);
 
 /* Session stuff
  */
-typedef struct
-{
-    void *iov_base;
-    size_t iov_len;
+typedef struct {
+    void *iov_base;
+    size_t iov_len;
 } giovec_t;
 
 typedef ssize_t(*gnutls_pull_func) (gnutls_transport_ptr_t, void *,
@@ -2431,6 +2430,7 @@ int gnutls_verify_stored_pubkey(const char *db_name,
 				const gnutls_datum_t * cert,
 				unsigned int flags);
 
+#define GNUTLS_SCOMMIT_FLAG_ALLOW_BROKEN 1
 int gnutls_store_commitment(const char *db_name,
 			    gnutls_tdb_t tdb,
 			    const char *host,

diff --git a/SMP/lib/priority_options.h b/SMP/lib/priority_options.h
@@ -1,4 +1,4 @@
-/* ANSI-C code produced by gperf version 3.1 */
+/* ANSI-C code produced by gperf version 3.0.4 */
 /* Command-line: gperf --global-table -t lib/priority_options.gperf  */
 /* Computed positions: -k'1,$' */
 
@@ -26,7 +26,7 @@
       && ('w' == 119) && ('x' == 120) && ('y' == 121) && ('z' == 122) \
       && ('{' == 123) && ('|' == 124) && ('}' == 125) && ('~' == 126))
 /* The character set is not based on ISO-646.  */
-#error "gperf generated tables don't work with this execution character set. Please report a bug to <[email protected]>."
+#error "gperf generated tables don't work with this execution character set. Please report a bug to <bug-gnu-[email protected]>."
 #endif
 
 #line 1 "lib/priority_options.gperf"
@@ -51,7 +51,7 @@ inline
 #endif
 #endif
 static unsigned int
-hash (register const char *str, register size_t len)
+hash (register const char *str, register unsigned int len)
 {
   static const unsigned char asso_values[] =
     {
@@ -155,14 +155,20 @@ static const struct priority_options_st wordlist[] =
     {"PROFILE_SUITEB192", enable_profile_suiteb192}
   };
 
+#ifdef __GNUC__
+__inline
+#if defined __GNUC_STDC_INLINE__ || defined __GNUC_GNU_INLINE__
+__attribute__ ((__gnu_inline__))
+#endif
+#endif
 const struct priority_options_st *
-in_word_set (register const char *str, register size_t len)
+in_word_set (register const char *str, register unsigned int len)
 {
   if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
     {
-      register unsigned int key = hash (str, len);
+      register int key = hash (str, len);
 
-      if (key <= MAX_HASH_VALUE)
+      if (key <= MAX_HASH_VALUE && key >= 0)
         {
           register const char *s = wordlist[key].name;