aboutsummaryrefslogtreecommitdiffstats
path: root/crypto/openssl/crypto/o_init.c
diff options
context:
space:
mode:
authorSimon L. B. Nielsen <simon@FreeBSD.org>2010-11-22 18:23:44 +0000
committerSimon L. B. Nielsen <simon@FreeBSD.org>2010-11-22 18:23:44 +0000
commita3ddd25abaadeab1a1bdbac75385d53ba5beb7e1 (patch)
tree5691801dabb6a06320a55f5ce8ed927af41514f3 /crypto/openssl/crypto/o_init.c
parentf7842e00f57fe6cfa3b337fbf078cad9fe291188 (diff)
parentf2c43d19b91f8847c1dfd87721254b44f963d9a2 (diff)
downloadsrc-a3ddd25abaadeab1a1bdbac75385d53ba5beb7e1.tar.gz
src-a3ddd25abaadeab1a1bdbac75385d53ba5beb7e1.zip
Merge OpenSSL 0.9.8p into head.
Security: CVE-2010-3864 Security: http://www.openssl.org/news/secadv_20101116.txt
Notes
Notes: svn path=/head/; revision=215697
Diffstat (limited to 'crypto/openssl/crypto/o_init.c')
-rw-r--r--crypto/openssl/crypto/o_init.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/crypto/openssl/crypto/o_init.c b/crypto/openssl/crypto/o_init.c
index 2a5f5aac76c0..d767a90a5f43 100644
--- a/crypto/openssl/crypto/o_init.c
+++ b/crypto/openssl/crypto/o_init.c
@@ -58,11 +58,16 @@
#include <e_os.h>
#include <openssl/err.h>
+
/* 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