Commit 38186bfd authored by Rich Salz's avatar Rich Salz
Browse files

Have only one DSO_METHOD_openssl 



Instead of have every DSO_METHOD_xxx in all platforms, ensure that only
one DSO_METHOD_openssl is available on all platforms.

Reviewed-by: default avatarTim Hudson <tjh@openssl.org>
parent 73decf59

crypto/dso/Makefile.in

+2 −2
Original line number Diff line number Diff line
@@ -15,9 +15,9 @@ CFLAGS= $(INCLUDES) $(CFLAG) $(SHARED_CFLAG) 
GENERAL=Makefile



LIB=$(TOP)/libcrypto.a

LIBSRC= dso_dl.c dso_dlfcn.c dso_err.c dso_lib.c dso_null.c \

LIBSRC= dso_dl.c dso_dlfcn.c dso_err.c dso_lib.c \

	dso_openssl.c dso_win32.c dso_vms.c

LIBOBJ= dso_dl.o dso_dlfcn.o dso_err.o dso_lib.o dso_null.o \

LIBOBJ= dso_dl.o dso_dlfcn.o dso_err.o dso_lib.o \

	dso_openssl.o dso_win32.o dso_vms.o



SRC= $(LIBSRC)

crypto/dso/build.info

+1 −1
Original line number Diff line number Diff line 
LIBS=../../libcrypto

SOURCE[../../libcrypto]=\

        dso_dl.c dso_dlfcn.c dso_err.c dso_lib.c dso_null.c \

        dso_dl.c dso_dlfcn.c dso_err.c dso_lib.c \

        dso_openssl.c dso_win32.c dso_vms.c

crypto/dso/dso_dl.c

+3 −8
Original line number Diff line number Diff line
@@ -58,12 +58,7 @@ 


#include "dso_locl.h"



#ifndef DSO_DL

DSO_METHOD *DSO_METHOD_dl(void)

{

    return NULL;

}

#else

#ifdef DSO_DL



# include <dl.h>
@@ -95,9 +90,9 @@ static DSO_METHOD dso_meth_dl = { 
    dl_globallookup

};



DSO_METHOD *DSO_METHOD_dl(void)

DSO_METHOD *DSO_METHOD_openssl(void)

{

    return (&dso_meth_dl);

    return &dso_meth_dl;

}



/*

crypto/dso/dso_dlfcn.c

+3 −8
Original line number Diff line number Diff line
@@ -67,12 +67,7 @@ 


#include "dso_locl.h"



#ifndef DSO_DLFCN

DSO_METHOD *DSO_METHOD_dlfcn(void)

{

    return NULL;

}

#else

#ifdef DSO_DLFCN



# ifdef HAVE_DLFCN_H

#  ifdef __osf__
@@ -117,9 +112,9 @@ static DSO_METHOD dso_meth_dlfcn = { 
    dlfcn_globallookup

};



DSO_METHOD *DSO_METHOD_dlfcn(void)

DSO_METHOD *DSO_METHOD_openssl(void)

{

    return (&dso_meth_dlfcn);

    return &dso_meth_dlfcn;

}



/*

crypto/dso/dso_locl.h

+0 −1
Original line number Diff line number Diff line
@@ -105,4 +105,3 @@ struct dso_meth_st { 
    /* Perform global symbol lookup, i.e. among *all* modules */

    void *(*globallookup) (const char *symname);

};