[openssl-commits] [openssl] master update

[Richard Levitte]

The branch master has been updated
       via  ac722c9af058661671f8e63972eb52e2bf9de378 (commit)
      from  7def9fae398dfd2de9b3e82ff4d6545edeaf4c1d (commit)


- Log -----------------------------------------------------------------
commit ac722c9af058661671f8e63972eb52e2bf9de378
Author: Richard Levitte <levitte at openssl.org>
Date:   Wed Mar 23 08:40:56 2016 +0100

    Small fixups in DSO
    
    - VMS configs had no dso_scheme
    - Incorrect return of NULL method.
    
    Reviewed-by: Tim Hudson <tjh at openssl.org>

-----------------------------------------------------------------------

Summary of changes:
 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 fb31614..0ce9231 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 070f116..62191d7 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