[PATCH 2/5] Add OPENSSL_NO_DSO

[Joakim Tjernlund]

Signed-off-by: Joakim Tjernlund <joakim.tjernl...@transmode.se>
---
 crypto/conf/conf_mod.c  | 4 ++++
 crypto/engine/eng_all.c | 2 ++
 2 files changed, 6 insertions(+)

diff --git a/crypto/conf/conf_mod.c b/crypto/conf/conf_mod.c
index 802677e..226a172 100644
--- a/crypto/conf/conf_mod.c
+++ b/crypto/conf/conf_mod.c
@@ -236,6 +236,7 @@ module_run(const CONF *cnf, char *name, char *value, 
unsigned long flags)
 static CONF_MODULE *
 module_load_dso(const CONF *cnf, char *name, char *value, unsigned long flags)
 {
+#ifndef OPENSSL_NO_DSO
        DSO *dso = NULL;
        conf_init_func *ifunc;
        conf_finish_func *ffunc;
@@ -273,6 +274,7 @@ err:
                DSO_free(dso);
        CONFerr(CONF_F_MODULE_LOAD_DSO, errcode);
        ERR_asprintf_error_data("module=%s, path=%s", name, path);
+#endif
        return NULL;
 }
 
@@ -430,8 +432,10 @@ CONF_modules_unload(int all)
 static void
 module_free(CONF_MODULE *md)
 {
+#ifndef OPENSSL_NO_DSO
        if (md->dso)
                DSO_free(md->dso);
+#endif
        free(md->name);
        free(md);
 }
diff --git a/crypto/engine/eng_all.c b/crypto/engine/eng_all.c
index 5c45603..f208ad4 100644
--- a/crypto/engine/eng_all.c
+++ b/crypto/engine/eng_all.c
@@ -77,7 +77,9 @@ ENGINE_load_builtin_engines(void)
 #ifndef OPENSSL_NO_RSAX
        ENGINE_load_rsax();
 #endif
+#ifndef OPENSSL_NO_DSO
        ENGINE_load_dynamic();
+#endif
 #ifndef OPENSSL_NO_STATIC_ENGINE
 #ifndef OPENSSL_NO_HW
 #ifndef OPENSSL_NO_HW_PADLOCK
-- 
1.8.5.5