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 /include | |
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 'include')
-rw-r--r-- | include/ssl_compat.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/ssl_compat.h b/include/ssl_compat.h index 9f4b6be8d95..8dc1225407e 100644 --- a/include/ssl_compat.h +++ b/include/ssl_compat.h @@ -73,7 +73,10 @@ #define EVP_MD_CTX_SIZE sizeof(EVP_MD_CTX) #endif +#ifndef DH_set0_pqg #define DH_set0_pqg(D,P,Q,G) ((D)->p= (P), (D)->g= (G)) +#endif + #define EVP_CIPHER_CTX_buf_noconst(ctx) ((ctx)->buf) #define EVP_CIPHER_CTX_encrypting(ctx) ((ctx)->encrypt) #define EVP_CIPHER_CTX_SIZE sizeof(EVP_CIPHER_CTX) |