diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2020-05-09 20:43:36 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2020-05-09 20:43:36 +0200 |
| commit | 13038e4705ed55e24362dfad977a1ee454cfebfd (patch) | |
| tree | ac3d37fe69e802dec8008748b86cc901f116eead /extra | |
| parent | 72c7b4eb4cc86ca2f6bdb9e105b67d39df018a40 (diff) | |
| parent | f5844e7c4bc693783f088a5fc9c399b786ddc8c1 (diff) | |
| download | mariadb-git-13038e4705ed55e24362dfad977a1ee454cfebfd.tar.gz | |
Merge branch '10.4' into 10.5
Diffstat (limited to 'extra')
| -rw-r--r-- | extra/wolfssl/user_settings.h.in | 9 | ||||
| m--------- | extra/wolfssl/wolfssl | 0 |
2 files changed, 7 insertions, 2 deletions
diff --git a/extra/wolfssl/user_settings.h.in b/extra/wolfssl/user_settings.h.in index 65be4542b08..98f05079e05 100644 --- a/extra/wolfssl/user_settings.h.in +++ b/extra/wolfssl/user_settings.h.in @@ -20,14 +20,19 @@ #define WOLFSSL_AES_COUNTER #define NO_WOLFSSL_STUB #define OPENSSL_ALL -#define WOLFSSL_ALLOW_TLSV10 +#undef WOLFSSL_ALLOW_TLSV10 /* see https://github.com/wolfSSL/wolfssl/issues/2960 */ +#define NO_OLD_TIMEVAL_NAME +/* + FP_MAX_BITS is set high solely to satisfy ssl_8k_key.test + WolfSSL will use more stack space with it, with fastmath +*/ +#define FP_MAX_BITS 16384 #cmakedefine WOLFSSL_AESNI #cmakedefine USE_FAST_MATH #cmakedefine TFM_TIMING_RESISTANT #cmakedefine HAVE_INTEL_RDSEED #cmakedefine USE_INTEL_SPEEDUP -#cmakedefine FP_MAX_BITS @FP_MAX_BITS@ #cmakedefine USE_FAST_MATH #cmakedefine WOLFSSL_X86_64_BUILD diff --git a/extra/wolfssl/wolfssl b/extra/wolfssl/wolfssl -Subproject 3f13b49fa318fbd3216d7da36d942e7c276d341 +Subproject e116c89a58af750421d82ece13f80516d2bde02 |