From ac722c9af058661671f8e63972eb52e2bf9de378 Mon Sep 17 00:00:00 2001 From: Richard Levitte Date: Wed, 23 Mar 2016 08:40:56 +0100 Subject: [PATCH] Small fixups in DSO - VMS configs had no dso_scheme - Incorrect return of NULL method. Reviewed-by: Tim Hudson --- Configurations/10-main.conf | 1 + crypto/dso/dso_openssl.c | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) 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 -- 2.25.1