Commit 28903862 authored by Matt Hauck's avatar Matt Hauck Committed by Richard Levitte
Browse files

Fix statically linked engine initialization w/ fips 

This only manifested itself with FIPS enabled statically linked
engines. The OPENSSL_init call ended up invoking RAND_init_fips
for a FIPS enabled build, which called CRYPTO_malloc, resulting in
disallowing the engine to finish its IMPLEMENT_DYNAMIC_BIND_FN call.

(Merged from https://github.com/openssl/openssl/pull/1308)Reviewed-by

: Geoff Thorpe <geoff@openssl.org>
Reviewed-by: default avatarRichard Levitte <levitte@openssl.org>
CLA: trivial
(Merged from https://github.com/openssl/openssl/pull/1308)
parent 348681ff

crypto/mem.c

+2 −2
Original line number Diff line number Diff line
@@ -150,12 +150,12 @@ static long (*get_debug_options_func) (void) = NULL; 
int CRYPTO_set_mem_functions(void *(*m) (size_t), void *(*r) (void *, size_t),

                             void (*f) (void *))

{

    /* Dummy call just to ensure OPENSSL_init() gets linked in */

    OPENSSL_init();

    if (!allow_customize)

        return 0;

    if ((m == 0) || (r == 0) || (f == 0))

        return 0;

    /* Dummy call just to ensure OPENSSL_init() gets linked in */

    OPENSSL_init();

    malloc_func = m;

    malloc_ex_func = default_malloc_ex;

    realloc_func = r;