summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Levitte <levitte@openssl.org>2016-03-23 08:40:56 +0100
committerRichard Levitte <levitte@openssl.org>2016-03-23 08:40:56 +0100
commitac722c9af058661671f8e63972eb52e2bf9de378 (patch)
tree80a437921c1d236a16f730141e11b9c08ec4e32b
parent7def9fae398dfd2de9b3e82ff4d6545edeaf4c1d (diff)
Small fixups in DSO
- VMS configs had no dso_scheme - Incorrect return of NULL method. Reviewed-by: Tim Hudson <tjh@openssl.org>
-rw-r--r--Configurations/10-main.conf1
-rw-r--r--crypto/dso/dso_openssl.c2
2 files changed, 2 insertions, 1 deletions
diff --git a/Configurations/10-main.conf b/Configurations/10-main.conf
index fb316143da..0ce9231e67 100644
--- 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 070f116217..62191d7538 100644
--- 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