SERVER-38006 Upgrade TomCrypt to 1.18.2

32 files changed, 130 insertions, 95 deletions

diff --git a/src/third_party/SConscript b/src/third_party/SConscript
index 990f779aff2..1a5e1f5ff12 100644
--- a/src/third_party/SConscript
+++ b/src/third_party/SConscript
@@ -16,7 +16,7 @@ yamlSuffix = '-0.6.2'
 icuSuffix = '-57.1'
 gperftoolsSuffix = '-2.5'
 timelibSuffix = '-2018.01alpha1'
-tomcryptSuffix = '-1.18.1'
+tomcryptSuffix = '-1.18.2'
 benchmarkSuffix = '-1.4.1'
 sqliteSuffix = '-amalgamation-3190300'
 
diff --git a/src/third_party/scripts/tomcrypt_get_sources.sh b/src/third_party/scripts/tomcrypt_get_sources.sh
index 89d10611c96..b9acffa2c6f 100644
--- a/src/third_party/scripts/tomcrypt_get_sources.sh
+++ b/src/third_party/scripts/tomcrypt_get_sources.sh
@@ -13,7 +13,7 @@ fi
 
 # how we got the last tom crypt sources
 
-VERSION=1.18.1
+VERSION=1.18.2
 
 cd `git rev-parse --show-toplevel`/src/third_party/tomcrypt-$VERSION
 
diff --git a/src/third_party/tomcrypt-1.18.1/LICENSE b/src/third_party/tomcrypt-1.18.1/LICENSE
deleted file mode 100644
index 294248fa5d3..00000000000
--- a/src/third_party/tomcrypt-1.18.1/LICENSE
+++ /dev/null
@@ -1,3 +0,0 @@
-LibTomCrypt is public domain.  As should all quality software be.
-
-Tom St Denis
diff --git a/src/third_party/tomcrypt-1.18.2/LICENSE b/src/third_party/tomcrypt-1.18.2/LICENSE
new file mode 100644
index 00000000000..c4afbc6b5bc
--- /dev/null
+++ b/src/third_party/tomcrypt-1.18.2/LICENSE
@@ -0,0 +1,29 @@
+LibTomCrypt is licensed under DUAL licensing terms.
+
+Choose and use the license of your needs.
+
+[LICENSE #1]
+
+LibTomCrypt is public domain.  As should all quality software be.
+
+Tom St Denis
+
+[/LICENSE #1]
+
+[LICENSE #2]
+
+            DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
+                    Version 2, December 2004
+
+ Copyright (C) 2004 Sam Hocevar <sam@hocevar.net>
+
+ Everyone is permitted to copy and distribute verbatim or modified
+ copies of this license document, and changing it is allowed as long
+ as the name is changed.
+
+            DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. You just DO WHAT THE FUCK YOU WANT TO. 
+
+[/LICENSE #2]
diff --git a/src/third_party/tomcrypt-1.18.1/SConscript b/src/third_party/tomcrypt-1.18.2/SConscript
index ac040bf3dea..ac040bf3dea 100644
--- a/src/third_party/tomcrypt-1.18.1/SConscript
+++ b/src/third_party/tomcrypt-1.18.2/SConscript
diff --git a/src/third_party/tomcrypt-1.18.1/src/hashes/helper/hash_memory.c b/src/third_party/tomcrypt-1.18.2/src/hashes/helper/hash_memory.c
index 36a38082d9b..0cfb7e34d63 100644
--- a/src/third_party/tomcrypt-1.18.1/src/hashes/helper/hash_memory.c
+++ b/src/third_party/tomcrypt-1.18.2/src/hashes/helper/hash_memory.c
@@ -64,6 +64,6 @@ LBL_ERR:
 }
 #endif /* #ifdef LTC_HASH_HELPERS */
 
-/* ref:         HEAD -> master, tag: v1.18.1 */
-/* git commit:  e08fd8630f9d9771226466877064055ee7e863d0 */
-/* commit time: 2018-01-22 11:02:57 +0100 */
+/* ref:         HEAD -> master, tag: v1.18.2 */
+/* git commit:  7e7eb695d581782f04b24dc444cbfde86af59853 */
+/* commit time: 2018-07-01 22:49:01 +0200 */
diff --git a/src/third_party/tomcrypt-1.18.1/src/hashes/sha1.c b/src/third_party/tomcrypt-1.18.2/src/hashes/sha1.c
index 7b372a90ccd..0e7cc215ba3 100644
--- a/src/third_party/tomcrypt-1.18.1/src/hashes/sha1.c
+++ b/src/third_party/tomcrypt-1.18.2/src/hashes/sha1.c
@@ -281,6 +281,6 @@ int  sha1_test(void)
 
 
 
-/* ref:         HEAD -> master, tag: v1.18.1 */
-/* git commit:  e08fd8630f9d9771226466877064055ee7e863d0 */
-/* commit time: 2018-01-22 11:02:57 +0100 */
+/* ref:         HEAD -> master, tag: v1.18.2 */
+/* git commit:  7e7eb695d581782f04b24dc444cbfde86af59853 */
+/* commit time: 2018-07-01 22:49:01 +0200 */
diff --git a/src/third_party/tomcrypt-1.18.1/src/hashes/sha2/sha256.c b/src/third_party/tomcrypt-1.18.2/src/hashes/sha2/sha256.c
index 75da1a2f9bc..6d809322175 100644
--- a/src/third_party/tomcrypt-1.18.1/src/hashes/sha2/sha256.c
+++ b/src/third_party/tomcrypt-1.18.2/src/hashes/sha2/sha256.c
@@ -329,6 +329,6 @@ int  sha256_test(void)
 
 
 
-/* ref:         HEAD -> master, tag: v1.18.1 */
-/* git commit:  e08fd8630f9d9771226466877064055ee7e863d0 */
-/* commit time: 2018-01-22 11:02:57 +0100 */
+/* ref:         HEAD -> master, tag: v1.18.2 */
+/* git commit:  7e7eb695d581782f04b24dc444cbfde86af59853 */
+/* commit time: 2018-07-01 22:49:01 +0200 */
diff --git a/src/third_party/tomcrypt-1.18.1/src/headers/tomcrypt.h b/src/third_party/tomcrypt-1.18.2/src/headers/tomcrypt.h
index 83c49d76586..1192ab5c84f 100644
--- a/src/third_party/tomcrypt-1.18.1/src/headers/tomcrypt.h
+++ b/src/third_party/tomcrypt-1.18.2/src/headers/tomcrypt.h
@@ -27,13 +27,15 @@ extern "C" {
 
 /* version */
 #define CRYPT   0x0118
-#define SCRYPT  "1.18.1"
+#define SCRYPT  "1.18.2"
 
 /* max size of either a cipher/hash block or symmetric key [largest of the two] */
 #define MAXBLOCKSIZE  128
 
+#ifndef TAB_SIZE
 /* descriptor table size */
 #define TAB_SIZE      32
+#endif
 
 /* error codes [will be expanded in future releases] */
 enum {
@@ -98,6 +100,6 @@ enum {
 #endif /* TOMCRYPT_H_ */
 
 
-/* ref:         HEAD -> master, tag: v1.18.1 */
-/* git commit:  e08fd8630f9d9771226466877064055ee7e863d0 */
-/* commit time: 2018-01-22 11:02:57 +0100 */
+/* ref:         HEAD -> master, tag: v1.18.2 */
+/* git commit:  7e7eb695d581782f04b24dc444cbfde86af59853 */
+/* commit time: 2018-07-01 22:49:01 +0200 */
diff --git a/src/third_party/tomcrypt-1.18.1/src/headers/tomcrypt_argchk.h b/src/third_party/tomcrypt-1.18.2/src/headers/tomcrypt_argchk.h
index 6095c280c91..c946712f8c2 100644
--- a/src/third_party/tomcrypt-1.18.1/src/headers/tomcrypt_argchk.h
+++ b/src/third_party/tomcrypt-1.18.2/src/headers/tomcrypt_argchk.h
@@ -48,6 +48,6 @@ void crypt_argchk(const char *v, const char *s, int d) NORETURN;
 #endif
 
 
-/* ref:         HEAD -> master, tag: v1.18.1 */
-/* git commit:  e08fd8630f9d9771226466877064055ee7e863d0 */
-/* commit time: 2018-01-22 11:02:57 +0100 */
+/* ref:         HEAD -> master, tag: v1.18.2 */
+/* git commit:  7e7eb695d581782f04b24dc444cbfde86af59853 */
+/* commit time: 2018-07-01 22:49:01 +0200 */
diff --git a/src/third_party/tomcrypt-1.18.1/src/headers/tomcrypt_cfg.h b/src/third_party/tomcrypt-1.18.2/src/headers/tomcrypt_cfg.h
index 3bb3f768cd7..ce0dd5f7fad 100644
--- a/src/third_party/tomcrypt-1.18.1/src/headers/tomcrypt_cfg.h
+++ b/src/third_party/tomcrypt-1.18.2/src/headers/tomcrypt_cfg.h
@@ -278,6 +278,6 @@ typedef unsigned long ltc_mp_digit;
 #endif
 
 
-/* ref:         HEAD -> master, tag: v1.18.1 */
-/* git commit:  e08fd8630f9d9771226466877064055ee7e863d0 */
-/* commit time: 2018-01-22 11:02:57 +0100 */
+/* ref:         HEAD -> master, tag: v1.18.2 */
+/* git commit:  7e7eb695d581782f04b24dc444cbfde86af59853 */
+/* commit time: 2018-07-01 22:49:01 +0200 */
diff --git a/src/third_party/tomcrypt-1.18.1/src/headers/tomcrypt_cipher.h b/src/third_party/tomcrypt-1.18.2/src/headers/tomcrypt_cipher.h
index ef0b5e5d344..6f0c30b63bd 100644
--- a/src/third_party/tomcrypt-1.18.1/src/headers/tomcrypt_cipher.h
+++ b/src/third_party/tomcrypt-1.18.2/src/headers/tomcrypt_cipher.h
@@ -1003,6 +1003,6 @@ int sober128_stream_test(void);
 
 #endif /* LTC_SOBER128_STREAM */
 
-/* ref:         HEAD -> master, tag: v1.18.1 */
-/* git commit:  e08fd8630f9d9771226466877064055ee7e863d0 */
-/* commit time: 2018-01-22 11:02:57 +0100 */
+/* ref:         HEAD -> master, tag: v1.18.2 */
+/* git commit:  7e7eb695d581782f04b24dc444cbfde86af59853 */
+/* commit time: 2018-07-01 22:49:01 +0200 */
diff --git a/src/third_party/tomcrypt-1.18.1/src/headers/tomcrypt_custom.h b/src/third_party/tomcrypt-1.18.2/src/headers/tomcrypt_custom.h
index b5cad3efe4e..e44a63a74b2 100644
--- a/src/third_party/tomcrypt-1.18.1/src/headers/tomcrypt_custom.h
+++ b/src/third_party/tomcrypt-1.18.2/src/headers/tomcrypt_custom.h
@@ -472,6 +472,13 @@
 #endif
 #endif
 
+#if defined(LTC_DER)
+   #ifndef LTC_DER_MAX_RECURSION
+      /* Maximum recursion limit when processing nested ASN.1 types. */
+      #define LTC_DER_MAX_RECURSION 30
+   #endif
+#endif
+
 #if defined(LTC_MECC) || defined(LTC_MRSA) || defined(LTC_MDSA) || defined(LTC_MKAT)
    /* Include the MPI functionality?  (required by the PK algorithms) */
    #define LTC_MPI
@@ -578,6 +585,6 @@
    #endif
 #endif
 
-/* ref:         HEAD -> master, tag: v1.18.1 */
-/* git commit:  e08fd8630f9d9771226466877064055ee7e863d0 */
-/* commit time: 2018-01-22 11:02:57 +0100 */
+/* ref:         HEAD -> master, tag: v1.18.2 */
+/* git commit:  7e7eb695d581782f04b24dc444cbfde86af59853 */
+/* commit time: 2018-07-01 22:49:01 +0200 */
diff --git a/src/third_party/tomcrypt-1.18.1/src/headers/tomcrypt_hash.h b/src/third_party/tomcrypt-1.18.2/src/headers/tomcrypt_hash.h
index 628c3b6541c..4bb02631d8b 100644
--- a/src/third_party/tomcrypt-1.18.1/src/headers/tomcrypt_hash.h
+++ b/src/third_party/tomcrypt-1.18.2/src/headers/tomcrypt_hash.h
@@ -526,6 +526,6 @@ int func_name (hash_state * md, const unsigned char *in, unsigned long inlen)
     return CRYPT_OK;                                                                        \
 }
 
-/* ref:         HEAD -> master, tag: v1.18.1 */
-/* git commit:  e08fd8630f9d9771226466877064055ee7e863d0 */
-/* commit time: 2018-01-22 11:02:57 +0100 */
+/* ref:         HEAD -> master, tag: v1.18.2 */
+/* git commit:  7e7eb695d581782f04b24dc444cbfde86af59853 */
+/* commit time: 2018-07-01 22:49:01 +0200 */
diff --git a/src/third_party/tomcrypt-1.18.1/src/headers/tomcrypt_mac.h b/src/third_party/tomcrypt-1.18.2/src/headers/tomcrypt_mac.h
index c5378c736aa..80b922e751c 100644
--- a/src/third_party/tomcrypt-1.18.1/src/headers/tomcrypt_mac.h
+++ b/src/third_party/tomcrypt-1.18.2/src/headers/tomcrypt_mac.h
@@ -560,6 +560,6 @@ int chacha20poly1305_test(void);
 
 #endif /* LTC_CHACHA20POLY1305_MODE */
 
-/* ref:         HEAD -> master, tag: v1.18.1 */
-/* git commit:  e08fd8630f9d9771226466877064055ee7e863d0 */
-/* commit time: 2018-01-22 11:02:57 +0100 */
+/* ref:         HEAD -> master, tag: v1.18.2 */
+/* git commit:  7e7eb695d581782f04b24dc444cbfde86af59853 */
+/* commit time: 2018-07-01 22:49:01 +0200 */
diff --git a/src/third_party/tomcrypt-1.18.1/src/headers/tomcrypt_macros.h b/src/third_party/tomcrypt-1.18.2/src/headers/tomcrypt_macros.h
index 4bd041f1840..a3a335e4557 100644
--- a/src/third_party/tomcrypt-1.18.1/src/headers/tomcrypt_macros.h
+++ b/src/third_party/tomcrypt-1.18.2/src/headers/tomcrypt_macros.h
@@ -441,6 +441,6 @@ static inline ulong64 ROR64(ulong64 word, int i)
 #define snprintf _snprintf
 #endif
 
-/* ref:         HEAD -> master, tag: v1.18.1 */
-/* git commit:  e08fd8630f9d9771226466877064055ee7e863d0 */
-/* commit time: 2018-01-22 11:02:57 +0100 */
+/* ref:         HEAD -> master, tag: v1.18.2 */
+/* git commit:  7e7eb695d581782f04b24dc444cbfde86af59853 */
+/* commit time: 2018-07-01 22:49:01 +0200 */
diff --git a/src/third_party/tomcrypt-1.18.1/src/headers/tomcrypt_math.h b/src/third_party/tomcrypt-1.18.2/src/headers/tomcrypt_math.h
index a9265965076..137e451ef18 100644
--- a/src/third_party/tomcrypt-1.18.1/src/headers/tomcrypt_math.h
+++ b/src/third_party/tomcrypt-1.18.2/src/headers/tomcrypt_math.h
@@ -578,6 +578,6 @@ extern const ltc_math_descriptor gmp_desc;
 
 #endif
 
-/* ref:         HEAD -> master, tag: v1.18.1 */
-/* git commit:  e08fd8630f9d9771226466877064055ee7e863d0 */
-/* commit time: 2018-01-22 11:02:57 +0100 */
+/* ref:         HEAD -> master, tag: v1.18.2 */
+/* git commit:  7e7eb695d581782f04b24dc444cbfde86af59853 */
+/* commit time: 2018-07-01 22:49:01 +0200 */
diff --git a/src/third_party/tomcrypt-1.18.1/src/headers/tomcrypt_misc.h b/src/third_party/tomcrypt-1.18.2/src/headers/tomcrypt_misc.h
index 9cc45c3d2e2..2460d665398 100644
--- a/src/third_party/tomcrypt-1.18.1/src/headers/tomcrypt_misc.h
+++ b/src/third_party/tomcrypt-1.18.2/src/headers/tomcrypt_misc.h
@@ -108,6 +108,6 @@ int crc32_test(void);
 
 int compare_testvector(const void* is, const unsigned long is_len, const void* should, const unsigned long should_len, const char* what, int which);
 
-/* ref:         HEAD -> master, tag: v1.18.1 */
-/* git commit:  e08fd8630f9d9771226466877064055ee7e863d0 */
-/* commit time: 2018-01-22 11:02:57 +0100 */
+/* ref:         HEAD -> master, tag: v1.18.2 */
+/* git commit:  7e7eb695d581782f04b24dc444cbfde86af59853 */
+/* commit time: 2018-07-01 22:49:01 +0200 */
diff --git a/src/third_party/tomcrypt-1.18.1/src/headers/tomcrypt_pk.h b/src/third_party/tomcrypt-1.18.2/src/headers/tomcrypt_pk.h
index e87caab20e5..4306bc37770 100644
--- a/src/third_party/tomcrypt-1.18.1/src/headers/tomcrypt_pk.h
+++ b/src/third_party/tomcrypt-1.18.2/src/headers/tomcrypt_pk.h
@@ -667,16 +667,16 @@ int der_printable_value_decode(int v);
 
 /* UTF-8 */
 #if (defined(SIZE_MAX) || __STDC_VERSION__ >= 199901L || defined(WCHAR_MAX) || defined(__WCHAR_MAX__) || defined(_WCHAR_T) || defined(_WCHAR_T_DEFINED) || defined (__WCHAR_TYPE__)) && !defined(LTC_NO_WCHAR)
-#include <wchar.h>
-#if defined(__WCHAR_MAX__)
-#define LTC_WCHAR_MAX __WCHAR_MAX__
-#elif defined(WCHAR_MAX)
-#define LTC_WCHAR_MAX WCHAR_MAX
-#endif
+   #if defined(__WCHAR_MAX__)
+      #define LTC_WCHAR_MAX __WCHAR_MAX__
+   #else
+      #include <wchar.h>
+      #define LTC_WCHAR_MAX WCHAR_MAX
+   #endif
 /* please note that it might happen that LTC_WCHAR_MAX is undefined */
 #else
-typedef ulong32 wchar_t;
-#define LTC_WCHAR_MAX 0xFFFFFFFF
+   typedef ulong32 wchar_t;
+   #define LTC_WCHAR_MAX 0xFFFFFFFF
 #endif
 
 int der_encode_utf8_string(const wchar_t *in,  unsigned long inlen,
@@ -742,6 +742,6 @@ int der_length_generalizedtime(ltc_generalizedtime *gtime, unsigned long *outlen
 
 #endif
 
-/* ref:         HEAD -> master, tag: v1.18.1 */
-/* git commit:  e08fd8630f9d9771226466877064055ee7e863d0 */
-/* commit time: 2018-01-22 11:02:57 +0100 */
+/* ref:         HEAD -> master, tag: v1.18.2 */
+/* git commit:  7e7eb695d581782f04b24dc444cbfde86af59853 */
+/* commit time: 2018-07-01 22:49:01 +0200 */
diff --git a/src/third_party/tomcrypt-1.18.1/src/headers/tomcrypt_pkcs.h b/src/third_party/tomcrypt-1.18.2/src/headers/tomcrypt_pkcs.h
index 5bbf7195403..b84028f122f 100644
--- a/src/third_party/tomcrypt-1.18.1/src/headers/tomcrypt_pkcs.h
+++ b/src/third_party/tomcrypt-1.18.2/src/headers/tomcrypt_pkcs.h
@@ -103,6 +103,6 @@ int pkcs_5_alg2(const unsigned char *password, unsigned long password_len,
 int pkcs_5_test (void);
 #endif  /* LTC_PKCS_5 */
 
-/* ref:         HEAD -> master, tag: v1.18.1 */
-/* git commit:  e08fd8630f9d9771226466877064055ee7e863d0 */
-/* commit time: 2018-01-22 11:02:57 +0100 */
+/* ref:         HEAD -> master, tag: v1.18.2 */
+/* git commit:  7e7eb695d581782f04b24dc444cbfde86af59853 */
+/* commit time: 2018-07-01 22:49:01 +0200 */
diff --git a/src/third_party/tomcrypt-1.18.1/src/headers/tomcrypt_prng.h b/src/third_party/tomcrypt-1.18.2/src/headers/tomcrypt_prng.h
index 78ce95c08c7..1fa164382fd 100644
--- a/src/third_party/tomcrypt-1.18.1/src/headers/tomcrypt_prng.h
+++ b/src/third_party/tomcrypt-1.18.2/src/headers/tomcrypt_prng.h
@@ -227,6 +227,6 @@ extern unsigned long (*ltc_rng)(unsigned char *out, unsigned long outlen,
 #endif
 
 
-/* ref:         HEAD -> master, tag: v1.18.1 */
-/* git commit:  e08fd8630f9d9771226466877064055ee7e863d0 */
-/* commit time: 2018-01-22 11:02:57 +0100 */
+/* ref:         HEAD -> master, tag: v1.18.2 */
+/* git commit:  7e7eb695d581782f04b24dc444cbfde86af59853 */
+/* commit time: 2018-07-01 22:49:01 +0200 */
diff --git a/src/third_party/tomcrypt-1.18.1/src/mac/hmac/hmac_done.c b/src/third_party/tomcrypt-1.18.2/src/mac/hmac/hmac_done.c
index 8249d89d39f..5e7c2d37f3a 100644
--- a/src/third_party/tomcrypt-1.18.1/src/mac/hmac/hmac_done.c
+++ b/src/third_party/tomcrypt-1.18.2/src/mac/hmac/hmac_done.c
@@ -102,6 +102,6 @@ LBL_ERR:
 
 #endif
 
-/* ref:         HEAD -> master, tag: v1.18.1 */
-/* git commit:  e08fd8630f9d9771226466877064055ee7e863d0 */
-/* commit time: 2018-01-22 11:02:57 +0100 */
+/* ref:         HEAD -> master, tag: v1.18.2 */
+/* git commit:  7e7eb695d581782f04b24dc444cbfde86af59853 */
+/* commit time: 2018-07-01 22:49:01 +0200 */
diff --git a/src/third_party/tomcrypt-1.18.1/src/mac/hmac/hmac_init.c b/src/third_party/tomcrypt-1.18.2/src/mac/hmac/hmac_init.c
index 1a414fd8bd3..fb5c3e32d07 100644
--- a/src/third_party/tomcrypt-1.18.1/src/mac/hmac/hmac_init.c
+++ b/src/third_party/tomcrypt-1.18.2/src/mac/hmac/hmac_init.c
@@ -103,6 +103,6 @@ done:
 
 #endif
 
-/* ref:         HEAD -> master, tag: v1.18.1 */
-/* git commit:  e08fd8630f9d9771226466877064055ee7e863d0 */
-/* commit time: 2018-01-22 11:02:57 +0100 */
+/* ref:         HEAD -> master, tag: v1.18.2 */
+/* git commit:  7e7eb695d581782f04b24dc444cbfde86af59853 */
+/* commit time: 2018-07-01 22:49:01 +0200 */
diff --git a/src/third_party/tomcrypt-1.18.1/src/mac/hmac/hmac_memory.c b/src/third_party/tomcrypt-1.18.2/src/mac/hmac/hmac_memory.c
index b98109cd51a..ea9c73730ac 100644
--- a/src/third_party/tomcrypt-1.18.1/src/mac/hmac/hmac_memory.c
+++ b/src/third_party/tomcrypt-1.18.2/src/mac/hmac/hmac_memory.c
@@ -81,6 +81,6 @@ LBL_ERR:
 #endif
 
 
-/* ref:         HEAD -> master, tag: v1.18.1 */
-/* git commit:  e08fd8630f9d9771226466877064055ee7e863d0 */
-/* commit time: 2018-01-22 11:02:57 +0100 */
+/* ref:         HEAD -> master, tag: v1.18.2 */
+/* git commit:  7e7eb695d581782f04b24dc444cbfde86af59853 */
+/* commit time: 2018-07-01 22:49:01 +0200 */
diff --git a/src/third_party/tomcrypt-1.18.1/src/mac/hmac/hmac_process.c b/src/third_party/tomcrypt-1.18.2/src/mac/hmac/hmac_process.c
index 61dc8745ef5..be7e158fe03 100644
--- a/src/third_party/tomcrypt-1.18.1/src/mac/hmac/hmac_process.c
+++ b/src/third_party/tomcrypt-1.18.2/src/mac/hmac/hmac_process.c
@@ -36,6 +36,6 @@ int hmac_process(hmac_state *hmac, const unsigned char *in, unsigned long inlen)
 #endif
 
 
-/* ref:         HEAD -> master, tag: v1.18.1 */
-/* git commit:  e08fd8630f9d9771226466877064055ee7e863d0 */
-/* commit time: 2018-01-22 11:02:57 +0100 */
+/* ref:         HEAD -> master, tag: v1.18.2 */
+/* git commit:  7e7eb695d581782f04b24dc444cbfde86af59853 */
+/* commit time: 2018-07-01 22:49:01 +0200 */
diff --git a/src/third_party/tomcrypt-1.18.1/src/misc/compare_testvector.c b/src/third_party/tomcrypt-1.18.2/src/misc/compare_testvector.c
index 80d13757868..67fe1c1f9a2 100644
--- a/src/third_party/tomcrypt-1.18.1/src/misc/compare_testvector.c
+++ b/src/third_party/tomcrypt-1.18.2/src/misc/compare_testvector.c
@@ -82,6 +82,6 @@ int compare_testvector(const void* is, const unsigned long is_len, const void* s
    return res;
 }
 
-/* ref:         HEAD -> master, tag: v1.18.1 */
-/* git commit:  e08fd8630f9d9771226466877064055ee7e863d0 */
-/* commit time: 2018-01-22 11:02:57 +0100 */
+/* ref:         HEAD -> master, tag: v1.18.2 */
+/* git commit:  7e7eb695d581782f04b24dc444cbfde86af59853 */
+/* commit time: 2018-07-01 22:49:01 +0200 */
diff --git a/src/third_party/tomcrypt-1.18.1/src/misc/crypt/crypt_argchk.c b/src/third_party/tomcrypt-1.18.2/src/misc/crypt/crypt_argchk.c
index c6a860345db..a93962420e3 100644
--- a/src/third_party/tomcrypt-1.18.1/src/misc/crypt/crypt_argchk.c
+++ b/src/third_party/tomcrypt-1.18.2/src/misc/crypt/crypt_argchk.c
@@ -22,6 +22,6 @@ void crypt_argchk(const char *v, const char *s, int d)
 }
 #endif
 
-/* ref:         HEAD -> master, tag: v1.18.1 */
-/* git commit:  e08fd8630f9d9771226466877064055ee7e863d0 */
-/* commit time: 2018-01-22 11:02:57 +0100 */
+/* ref:         HEAD -> master, tag: v1.18.2 */
+/* git commit:  7e7eb695d581782f04b24dc444cbfde86af59853 */
+/* commit time: 2018-07-01 22:49:01 +0200 */
diff --git a/src/third_party/tomcrypt-1.18.1/src/misc/crypt/crypt_find_hash.c b/src/third_party/tomcrypt-1.18.2/src/misc/crypt/crypt_find_hash.c
index 2fd30cef229..8f86414e5d9 100644
--- a/src/third_party/tomcrypt-1.18.1/src/misc/crypt/crypt_find_hash.c
+++ b/src/third_party/tomcrypt-1.18.2/src/misc/crypt/crypt_find_hash.c
@@ -33,6 +33,6 @@ int find_hash(const char *name)
    return -1;
 }
 
-/* ref:         HEAD -> master, tag: v1.18.1 */
-/* git commit:  e08fd8630f9d9771226466877064055ee7e863d0 */
-/* commit time: 2018-01-22 11:02:57 +0100 */
+/* ref:         HEAD -> master, tag: v1.18.2 */
+/* git commit:  7e7eb695d581782f04b24dc444cbfde86af59853 */
+/* commit time: 2018-07-01 22:49:01 +0200 */
diff --git a/src/third_party/tomcrypt-1.18.1/src/misc/crypt/crypt_hash_descriptor.c b/src/third_party/tomcrypt-1.18.2/src/misc/crypt/crypt_hash_descriptor.c
index 204ab54612f..dc64cff4374 100644
--- a/src/third_party/tomcrypt-1.18.1/src/misc/crypt/crypt_hash_descriptor.c
+++ b/src/third_party/tomcrypt-1.18.2/src/misc/crypt/crypt_hash_descriptor.c
@@ -20,6 +20,6 @@ struct ltc_hash_descriptor hash_descriptor[TAB_SIZE] = {
 LTC_MUTEX_GLOBAL(ltc_hash_mutex)
 
 
-/* ref:         HEAD -> master, tag: v1.18.1 */
-/* git commit:  e08fd8630f9d9771226466877064055ee7e863d0 */
-/* commit time: 2018-01-22 11:02:57 +0100 */
+/* ref:         HEAD -> master, tag: v1.18.2 */
+/* git commit:  7e7eb695d581782f04b24dc444cbfde86af59853 */
+/* commit time: 2018-07-01 22:49:01 +0200 */
diff --git a/src/third_party/tomcrypt-1.18.1/src/misc/crypt/crypt_hash_is_valid.c b/src/third_party/tomcrypt-1.18.2/src/misc/crypt/crypt_hash_is_valid.c
index a101b6b4155..02079064dca 100644
--- a/src/third_party/tomcrypt-1.18.1/src/misc/crypt/crypt_hash_is_valid.c
+++ b/src/third_party/tomcrypt-1.18.2/src/misc/crypt/crypt_hash_is_valid.c
@@ -29,6 +29,6 @@ int hash_is_valid(int idx)
    return CRYPT_OK;
 }
 
-/* ref:         HEAD -> master, tag: v1.18.1 */
-/* git commit:  e08fd8630f9d9771226466877064055ee7e863d0 */
-/* commit time: 2018-01-22 11:02:57 +0100 */
+/* ref:         HEAD -> master, tag: v1.18.2 */
+/* git commit:  7e7eb695d581782f04b24dc444cbfde86af59853 */
+/* commit time: 2018-07-01 22:49:01 +0200 */
diff --git a/src/third_party/tomcrypt-1.18.1/src/misc/crypt/crypt_register_hash.c b/src/third_party/tomcrypt-1.18.2/src/misc/crypt/crypt_register_hash.c
index 100d5227278..ce43e6cd0a1 100644
--- a/src/third_party/tomcrypt-1.18.1/src/misc/crypt/crypt_register_hash.c
+++ b/src/third_party/tomcrypt-1.18.2/src/misc/crypt/crypt_register_hash.c
@@ -47,6 +47,6 @@ int register_hash(const struct ltc_hash_descriptor *hash)
    return -1;
 }
 
-/* ref:         HEAD -> master, tag: v1.18.1 */
-/* git commit:  e08fd8630f9d9771226466877064055ee7e863d0 */
-/* commit time: 2018-01-22 11:02:57 +0100 */
+/* ref:         HEAD -> master, tag: v1.18.2 */
+/* git commit:  7e7eb695d581782f04b24dc444cbfde86af59853 */
+/* commit time: 2018-07-01 22:49:01 +0200 */
diff --git a/src/third_party/tomcrypt-1.18.1/src/misc/zeromem.c b/src/third_party/tomcrypt-1.18.2/src/misc/zeromem.c
index cd3ae68db75..dc81d9b1e26 100644
--- a/src/third_party/tomcrypt-1.18.1/src/misc/zeromem.c
+++ b/src/third_party/tomcrypt-1.18.2/src/misc/zeromem.c
@@ -27,6 +27,6 @@ void zeromem(volatile void *out, size_t outlen)
    }
 }
 
-/* ref:         HEAD -> master, tag: v1.18.1 */
-/* git commit:  e08fd8630f9d9771226466877064055ee7e863d0 */
-/* commit time: 2018-01-22 11:02:57 +0100 */
+/* ref:         HEAD -> master, tag: v1.18.2 */
+/* git commit:  7e7eb695d581782f04b24dc444cbfde86af59853 */
+/* commit time: 2018-07-01 22:49:01 +0200 */