mirror of
https://github.com/MariaDB/server.git
synced 2026-04-27 18:55:31 +02:00
openssl: add a more specific DES support detection
Improve detection for DES support in OpenSSL, to allow compilation against system OpenSSL without DES. Note that MariaDB needs to be compiled against OpenSSL-like library that itself has DES support which cmake detected. Positive detection is indicated with CMake variable HAVE_des 1. Signed-off-by: Dimitri John Ledkov <dimitri.ledkov@surgut.co.uk>
This commit is contained in:
parent
f9575495ce
commit
bf77f9793d
10 changed files with 67 additions and 55 deletions
|
|
@ -392,7 +392,7 @@ bool reload_acl_and_cache(THD *thd, unsigned long long options,
|
|||
}
|
||||
}
|
||||
#endif
|
||||
#ifdef HAVE_OPENSSL
|
||||
#ifdef HAVE_des
|
||||
if (options & REFRESH_DES_KEY_FILE)
|
||||
{
|
||||
if (des_key_file && load_des_key_file(des_key_file))
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue