summaryrefslogtreecommitdiff
path: root/extra
diff options
context:
space:
mode:
authorVladislav Vaintroub <wlad@mariadb.com>2020-05-05 18:10:53 +0200
committerSergei Golubchik <serg@mariadb.org>2020-05-08 11:51:03 +0200
commit403dc759d0bc5d045da06fb326cdf59b23084953 (patch)
tree159f9cada54d23a231c81f98fad2f8ef5a912d6e /extra
parent8d85715d507de8937a181e999501e205ff3dca34 (diff)
downloadmariadb-git-403dc759d0bc5d045da06fb326cdf59b23084953.tar.gz
Update WolfSSL
Fix WolfSSL build: - Do not build with TLSv1.0,it stopped working,at least with SChannel client - Disable a test that depends on TLSv1.0 - define FP_MAX_BITS always, to fix 32bit builds. - Increase MAX_AES_CTX_SIZE, to fix build on Linux
Diffstat (limited to 'extra')
-rw-r--r--extra/wolfssl/user_settings.h.in8
m---------extra/wolfssl/wolfssl0
2 files changed, 6 insertions, 2 deletions
diff --git a/extra/wolfssl/user_settings.h.in b/extra/wolfssl/user_settings.h.in
index 65be4542b08..de9d9b5a8d9 100644
--- a/extra/wolfssl/user_settings.h.in
+++ b/extra/wolfssl/user_settings.h.in
@@ -20,14 +20,18 @@
#define WOLFSSL_AES_COUNTER
#define NO_WOLFSSL_STUB
#define OPENSSL_ALL
-#define WOLFSSL_ALLOW_TLSV10
+#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