From d743b61f891563ad8712464d58d20da5cdd0f939 Mon Sep 17 00:00:00 2001 From: Daniel Black Date: Thu, 18 Jan 2018 18:48:50 +1100 Subject: 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 --- mysys_ssl/openssl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'mysys_ssl/openssl.c') 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; -- cgit v1.2.1