From d259b1406044b430fe5786cd57e272bb9c57166d Mon Sep 17 00:00:00 2001 From: Matthew Garrett Date: Mon, 2 Jul 2012 12:33:42 -0400 Subject: Update OpenSSL --- Cryptlib/OpenSSL/crypto/o_init.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) (limited to 'Cryptlib/OpenSSL/crypto/o_init.c') diff --git a/Cryptlib/OpenSSL/crypto/o_init.c b/Cryptlib/OpenSSL/crypto/o_init.c index 00ed65a6..d767a90a 100755 --- a/Cryptlib/OpenSSL/crypto/o_init.c +++ b/Cryptlib/OpenSSL/crypto/o_init.c @@ -59,6 +59,16 @@ #include #include +/* Internal only functions: only ever used here */ +#ifdef OPENSSL_FIPS +extern void int_ERR_lib_init(void); +# ifndef OPENSSL_NO_ENGINE +extern void int_EVP_MD_init_engine_callbacks(void ); +extern void int_EVP_CIPHER_init_engine_callbacks(void ); +extern void int_RAND_init_engine_callbacks(void ); +# endif +#endif + /* Perform any essential OpenSSL initialization operations. * Currently only sets FIPS callbacks */ @@ -73,7 +83,7 @@ void OPENSSL_init(void) #ifdef CRYPTO_MDEBUG CRYPTO_malloc_debug_init(); #endif -#ifdef OPENSSL_ENGINE +#ifndef OPENSSL_NO_ENGINE int_EVP_MD_init_engine_callbacks(); int_EVP_CIPHER_init_engine_callbacks(); int_RAND_init_engine_callbacks(); -- cgit v1.2.3