diff options
| author | Daniel Black <grooverdan@users.sourceforge.net> | 2018-01-18 18:48:50 +1100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2018-02-07 11:45:01 +0100 |
| commit | d743b61f891563ad8712464d58d20da5cdd0f939 (patch) | |
| tree | 84a5b4ba50382c88bafea68ff1c87967e65b8d55 /mysys_ssl | |
| parent | 10590dd39cc1e742bbf395c3285201a6a31c5284 (diff) | |
| download | mariadb-git-d743b61f891563ad8712464d58d20da5cdd0f939.tar.gz | |
MDEV-14567: CRYPTO_set_mem_functions fails in FIPS mode
If the CRYPTO_set_mem_functions fails just return success
from check_openssl_compatibility. The only case where
CRYPTO_set_mem_functions fails is the allow_customize==0 (aka FIPS
mode). The check_openssl_compatibility isn't able to complete unless
this function returns success.
ref: https://github.com/openssl/openssl/blob/OpenSSL_1_1_0g/crypto/mem.c#L34
Diffstat (limited to 'mysys_ssl')
| -rw-r--r-- | mysys_ssl/openssl.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysys_ssl/openssl.c b/mysys_ssl/openssl.c index 3f841eec92f..f3dc8f4277c 100644 --- a/mysys_ssl/openssl.c +++ b/mysys_ssl/openssl.c @@ -51,7 +51,7 @@ int check_openssl_compatibility() EVP_MD_CTX *md5_ctx; if (!CRYPTO_set_mem_functions(coc_malloc, NULL, NULL)) - return 1; + return 0; testing= 1; alloc_size= alloc_count= 0; |