diff options
| author | Vladislav Vaintroub <wlad@mariadb.com> | 2022-01-24 20:00:35 +0100 |
|---|---|---|
| committer | Oleksandr Byelkin <sanja@mariadb.com> | 2022-01-25 11:19:00 +0100 |
| commit | be1d965384754845c6f61ff7eb4b43c799837180 (patch) | |
| tree | 1c58ab467a8d2ab923494637acd65acf870f9ba9 /extra/wolfssl | |
| parent | 8db47403fff7a06ea40c0aaa6a351060d2ba480d (diff) | |
| download | mariadb-git-be1d965384754845c6f61ff7eb4b43c799837180.tar.gz | |
MDEV-27373 wolfSSL 5.1.1
- compile wolfcrypt with kdf.c, to avoid undefined symbols in tls13.c
- define WOLFSSL_HAVE_ERROR_QUEUE to avoid endless loop SSL_get_error
- Do not use SSL_CTX_set_tmp_dh/get_dh2048, this would require additional
compilation options in WolfSSL. Disable it for WolfSSL build, it works
without it anyway.
- fix "macro already defined" Windows warning.
Diffstat (limited to 'extra/wolfssl')
| -rw-r--r-- | extra/wolfssl/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | extra/wolfssl/user_settings.h.in | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/extra/wolfssl/CMakeLists.txt b/extra/wolfssl/CMakeLists.txt index 387f6189609..bc51af05666 100644 --- a/extra/wolfssl/CMakeLists.txt +++ b/extra/wolfssl/CMakeLists.txt @@ -104,6 +104,7 @@ ${WOLFCRYPT_SRCDIR}/wc_port.c ${WOLFCRYPT_SRCDIR}/wc_encrypt.c ${WOLFCRYPT_SRCDIR}/hash.c ${WOLFCRYPT_SRCDIR}/wolfmath.c +${WOLFCRYPT_SRCDIR}/kdf.c ) # Use fastmath large number math library. diff --git a/extra/wolfssl/user_settings.h.in b/extra/wolfssl/user_settings.h.in index 55b43655659..bbe8c820019 100644 --- a/extra/wolfssl/user_settings.h.in +++ b/extra/wolfssl/user_settings.h.in @@ -2,6 +2,7 @@ #define WOLFSSL_USER_SETTINGS_H #define HAVE_CRL +#define WOLFSSL_HAVE_ERROR_QUEUE #define WOLFSSL_MYSQL_COMPATIBLE #define HAVE_ECC #define ECC_TIMING_RESISTANT |