projects
/
oweals
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
arm_arch.h: allow to specify __ARM_ARCH__ elsewhere.
[oweals/openssl.git]
/
crypto
/
conf
/
conf_mall.c
diff --git
a/crypto/conf/conf_mall.c
b/crypto/conf/conf_mall.c
index d702af689ba32422f3cd6c430087a96d54b16de2..c6f4cb2d55be18b6211d91929e224b4c183dea46 100644
(file)
--- a/
crypto/conf/conf_mall.c
+++ b/
crypto/conf/conf_mall.c
@@
-1,5
+1,5
@@
/* conf_mall.c */
/* conf_mall.c */
-/* Written by Stephen Henson (s
henson@bigfoot.com
) for the OpenSSL
+/* Written by Stephen Henson (s
teve@openssl.org
) for the OpenSSL
* project 2001.
*/
/* ====================================================================
* project 2001.
*/
/* ====================================================================
@@
-63,7
+63,9
@@
#include <openssl/dso.h>
#include <openssl/x509.h>
#include <openssl/asn1.h>
#include <openssl/dso.h>
#include <openssl/x509.h>
#include <openssl/asn1.h>
+#ifndef OPENSSL_NO_ENGINE
#include <openssl/engine.h>
#include <openssl/engine.h>
+#endif
/* Load all OpenSSL builtin modules */
/* Load all OpenSSL builtin modules */
@@
-71,6
+73,8
@@
void OPENSSL_load_builtin_modules(void)
{
/* Add builtin modules here */
ASN1_add_oid_module();
{
/* Add builtin modules here */
ASN1_add_oid_module();
+#ifndef OPENSSL_NO_ENGINE
ENGINE_add_conf_module();
ENGINE_add_conf_module();
+#endif
}
}