aboutsummaryrefslogtreecommitdiffstats
path: root/crypto/openssl/crypto/o_init.c
diff options
context:
space:
mode:
authorSimon L. B. Nielsen <simon@FreeBSD.org>2010-03-13 19:22:41 +0000
committerSimon L. B. Nielsen <simon@FreeBSD.org>2010-03-13 19:22:41 +0000
commit6a599222bb564010b80b78eef3f2b6ba6c8db14a (patch)
tree909a7c21b7df72ae8c08b80b468a4dd75b3820be /crypto/openssl/crypto/o_init.c
parentc5af82e51782b019d13e562a07c17dc19a282de2 (diff)
parentf7a1b4761cf3f798e1b42d703d38221b47ce1eec (diff)
downloadsrc-6a599222bb564010b80b78eef3f2b6ba6c8db14a.tar.gz
src-6a599222bb564010b80b78eef3f2b6ba6c8db14a.zip
Merge OpenSSL 0.9.8m into head.
This also "reverts" some FreeBSD local changes so we should now be back to using entirely stock OpenSSL. The local changes were simple $FreeBSD$ lines additions, which were required in the CVS days, and the patch for FreeBSD-SA-09:15.ssl which has been superseded with OpenSSL 0.9.8m's RFC5746 'TLS renegotiation extension' support. MFC after: 3 weeks
Notes
Notes: svn path=/head/; revision=205128
Diffstat (limited to 'crypto/openssl/crypto/o_init.c')
-rw-r--r--crypto/openssl/crypto/o_init.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/crypto/openssl/crypto/o_init.c b/crypto/openssl/crypto/o_init.c
index 00ed65a6cf2d..2a5f5aac76c0 100644
--- a/crypto/openssl/crypto/o_init.c
+++ b/crypto/openssl/crypto/o_init.c
@@ -58,6 +58,11 @@
#include <e_os.h>
#include <openssl/err.h>
+/* Internal only functions: only ever used here */
+extern void int_ERR_lib_init(void);
+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 );
/* Perform any essential OpenSSL initialization operations.
* Currently only sets FIPS callbacks
@@ -73,7 +78,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();