diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2021-01-01 19:15:46 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2021-01-02 11:56:41 +0200 |
| commit | c1a7a82bcac4b8694bdb79c665b42de7a3865d05 (patch) | |
| tree | 7ccb506e49974c1f7f542531153050782036004c | |
| parent | 3454b5cf35a61e8f6cfab376638520dee4a50609 (diff) | |
| download | mariadb-git-c1a7a82bcac4b8694bdb79c665b42de7a3865d05.tar.gz | |
WolfSSL v4.6.0-stable
| -rw-r--r-- | extra/wolfssl/CMakeLists.txt | 2 | ||||
| m--------- | extra/wolfssl/wolfssl | 0 | ||||
| -rw-r--r-- | include/ssl_compat.h | 6 |
3 files changed, 4 insertions, 4 deletions
diff --git a/extra/wolfssl/CMakeLists.txt b/extra/wolfssl/CMakeLists.txt index 953d377ebcf..566106abb86 100644 --- a/extra/wolfssl/CMakeLists.txt +++ b/extra/wolfssl/CMakeLists.txt @@ -44,7 +44,7 @@ ADD_DEFINITIONS(-DWOLFSSL_LIB -DBUILDING_WOLFSSL) INCLUDE_DIRECTORIES(BEFORE ${CMAKE_CURRENT_SOURCE_DIR}/wolfssl) IF(MSVC) # size_t to long truncation warning - SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -wd4267 -wd4334 -wd4028") + SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -wd4267 -wd4334 -wd4028 -wd4244") ENDIF() ADD_CONVENIENCE_LIBRARY(wolfssl ${WOLFSSL_SOURCES}) diff --git a/extra/wolfssl/wolfssl b/extra/wolfssl/wolfssl -Subproject e116c89a58af750421d82ece13f80516d2bde02 +Subproject 9c87f979a7f1d3a6d786b260653d566c1d31a1c diff --git a/include/ssl_compat.h b/include/ssl_compat.h index 8cc0e6a9a2b..9f4b6be8d95 100644 --- a/include/ssl_compat.h +++ b/include/ssl_compat.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2016, 2017 MariaDB Corporation + Copyright (c) 2016, 2021, MariaDB Corporation. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -73,19 +73,19 @@ #define EVP_MD_CTX_SIZE sizeof(EVP_MD_CTX) #endif -#define OPENSSL_init_ssl(X,Y) SSL_library_init() #define DH_set0_pqg(D,P,Q,G) ((D)->p= (P), (D)->g= (G)) #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) #ifndef HAVE_WOLFSSL +#define OPENSSL_init_ssl(X,Y) SSL_library_init() #define EVP_MD_CTX_reset(X) EVP_MD_CTX_cleanup(X) #define EVP_CIPHER_CTX_reset(X) EVP_CIPHER_CTX_cleanup(X) -#endif #define X509_get0_notBefore(X) X509_get_notBefore(X) #define X509_get0_notAfter(X) X509_get_notAfter(X) #endif +#endif #ifndef TLS1_3_VERSION #define SSL_CTX_set_ciphersuites(X,Y) 0 |