Small fixups in DSO

- VMS configs had no dso_scheme
- Incorrect return of NULL method.

Reviewed-by: Tim Hudson <tjh@openssl.org>

diff --git a/Configurations/10-main.conf b/Configurations/10-main.conf
index fb316143dac6a19d5a7aa87d4bb757e9e37d83d1..0ce9231e679f27333fcd79b4eee56f52f5f36896 100644 (file)
--- a/Configurations/10-main.conf
+++ b/Configurations/10-main.conf
@@ -1703,6 +1703,7 @@ sub vc_wince_info {
                                    debug   => "/DEBUG/TRACEBACK",
                                    release => "/NODEBUG/NOTRACEBACK"),
         shared_target    => "vms-shared",
+        dso_scheme       => "vms",
         thread_scheme    => "pthreads",
 
         apps_aux_src     => "vms_decc_init.c",

diff --git a/crypto/dso/dso_openssl.c b/crypto/dso/dso_openssl.c
index 070f1162178be34b73f7333183e7ed9a692d356f..62191d753889b02732fff7bfcf3d4394ec9e4654 100644 (file)
--- a/crypto/dso/dso_openssl.c
+++ b/crypto/dso/dso_openssl.c
@@ -66,6 +66,6 @@ static DSO_METHOD dso_meth_null = {
 
 DSO_METHOD *DSO_METHOD_openssl(void)
 {
-    return dso_meth_null();
+    return &dso_meth_null;
 }
 #endif