diff options
| author | Richard Levitte <levitte@openssl.org> | 2003-01-30 17:39:26 +0000 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2003-01-30 17:39:26 +0000 |
| commit | 0b13e9f055d3f7be066dc2e89fc9f9822b12eca7 (patch) | |
| tree | 633b5d3e4c9356eaf9816541aaa079a0c3be9194 /crypto/conf | |
| parent | 96f7065f6392e19f1449578aaeabb8dc39294fa7 (diff) | |
Add the possibility to build without the ENGINE framework.
PR: 287
Diffstat (limited to 'crypto/conf')
| -rw-r--r-- | crypto/conf/conf_mall.c | 4 | ||||
| -rw-r--r-- | crypto/conf/conf_sap.c | 4 |
2 files changed, 8 insertions, 0 deletions
diff --git a/crypto/conf/conf_mall.c b/crypto/conf/conf_mall.c index d702af689b..4ba40cf44c 100644 --- a/crypto/conf/conf_mall.c +++ b/crypto/conf/conf_mall.c @@ -63,7 +63,9 @@ #include <openssl/dso.h> #include <openssl/x509.h> #include <openssl/asn1.h> +#ifndef OPENSSL_NO_ENGINE #include <openssl/engine.h> +#endif /* Load all OpenSSL builtin modules */ @@ -71,6 +73,8 @@ void OPENSSL_load_builtin_modules(void) { /* Add builtin modules here */ ASN1_add_oid_module(); +#ifndef OPENSSL_NO_ENGINE ENGINE_add_conf_module(); +#endif } diff --git a/crypto/conf/conf_sap.c b/crypto/conf/conf_sap.c index 97fb174303..e15c2e5546 100644 --- a/crypto/conf/conf_sap.c +++ b/crypto/conf/conf_sap.c @@ -63,7 +63,9 @@ #include <openssl/dso.h> #include <openssl/x509.h> #include <openssl/asn1.h> +#ifndef OPENSSL_NO_ENGINE #include <openssl/engine.h> +#endif /* This is the automatic configuration loader: it is called automatically by * OpenSSL when any of a number of standard initialisation functions are called, @@ -78,8 +80,10 @@ void OPENSSL_config(const char *config_name) return; OPENSSL_load_builtin_modules(); +#ifndef OPENSSL_NO_ENGINE /* Need to load ENGINEs */ ENGINE_load_builtin_engines(); +#endif /* Add others here? */ |