Linux on Alpha has the configuration name linux-alpha-gcc, not

[openssl.git] / crypto / dso / dso_dlfcn.c

diff --git a/crypto/dso/dso_dlfcn.c b/crypto/dso/dso_dlfcn.c
index c5db28f3566c73077eda051d9102126be34a2670..e709c721cc348dbffae72382698ef7af3bc2df09 100644 (file)
--- a/crypto/dso/dso_dlfcn.c
+++ b/crypto/dso/dso_dlfcn.c
@@ -71,24 +71,32 @@ DSO_METHOD *DSO_METHOD_dlfcn(void)
 #include <dlfcn.h>
 #endif
 
+/* Part of the hack in "dlfcn_load" ... */
+#define DSO_MAX_TRANSLATED_SIZE 256
+
 static int dlfcn_load(DSO *dso, const char *filename);
 static int dlfcn_unload(DSO *dso);
-static int dlfcn_bind(DSO *dso, const char *symname, void **symptr);
+static void *dlfcn_bind_var(DSO *dso, const char *symname);
+static DSO_FUNC_TYPE dlfcn_bind_func(DSO *dso, const char *symname);
 #if 0
 static int dlfcn_unbind(DSO *dso, char *symname, void *symptr);
 static int dlfcn_init(DSO *dso);
 static int dlfcn_finish(DSO *dso);
 #endif
+static long dlfcn_ctrl(DSO *dso, int cmd, long larg, void *parg);
 
 static DSO_METHOD dso_meth_dlfcn = {
        "OpenSSL 'dlfcn' shared library method",
        dlfcn_load,
        dlfcn_unload,
-       dlfcn_bind,
+       dlfcn_bind_var,
+       dlfcn_bind_func,
 /* For now, "unbind" doesn't exist */
 #if 0
-       NULL, /* unbind */
+       NULL, /* unbind_var */
+       NULL, /* unbind_func */
 #endif
+       dlfcn_ctrl,
        NULL, /* init */
        NULL  /* finish */
        };
@@ -98,6 +106,26 @@ DSO_METHOD *DSO_METHOD_dlfcn(void)
        return(&dso_meth_dlfcn);
        }
 
+/* Prior to using the dlopen() function, we should decide on the flag
+ * we send. There's a few different ways of doing this and it's a
+ * messy venn-diagram to match up which platforms support what. So
+ * as we don't have autoconf yet, I'm implementing a hack that could
+ * be hacked further relatively easily to deal with cases as we find
+ * them. Initially this is to cope with OpenBSD. */
+#ifdef __OpenBSD__
+#      ifdef DL_LAZY
+#              define DLOPEN_FLAG DL_LAZY
+#      else
+#              ifdef RTLD_NOW
+#                      define DLOPEN_FLAG RTLD_NOW
+#              else
+#                      define DLOPEN_FLAG 0
+#              endif
+#      endif
+#else
+#      define DLOPEN_FLAG RTLD_NOW /* Hope this works everywhere else */
+#endif
+
 /* For this DSO_METHOD, our meth_data STACK will contain;
  * (i) the handle (void*) returned from dlopen().
  */
@@ -105,8 +133,25 @@ DSO_METHOD *DSO_METHOD_dlfcn(void)
 static int dlfcn_load(DSO *dso, const char *filename)
        {
        void *ptr;
+       char translated[DSO_MAX_TRANSLATED_SIZE];
+       int len;
 
-       ptr = dlopen(filename, RTLD_NOW);
+       /* NB: This is a hideous hack, but I'm not yet sure what
+        * to replace it with. This attempts to convert any filename,
+        * that looks like it has no path information, into a
+        * translated form, e. "blah" -> "libblah.so" */
+       len = strlen(filename);
+       if((dso->flags & DSO_FLAG_NAME_TRANSLATION) &&
+                       (len + 6 < DSO_MAX_TRANSLATED_SIZE) &&
+                       (strstr(filename, "/") == NULL))
+               {
+               sprintf(translated, "lib%s.so", filename);
+               ptr = dlopen(translated, DLOPEN_FLAG);
+               }
+       else
+               {
+               ptr = dlopen(filename, DLOPEN_FLAG);
+               }
        if(ptr == NULL)
                {
                DSOerr(DSO_F_DLFCN_LOAD,DSO_R_LOAD_FAILED);
@@ -130,10 +175,7 @@ static int dlfcn_unload(DSO *dso)
                return(0);
                }
        if(sk_num(dso->meth_data) < 1)
-               {
-               DSOerr(DSO_F_DLFCN_UNLOAD,DSO_R_STACK_ERROR);
-               return(0);
-               }
+               return(1);
        ptr = (void *)sk_pop(dso->meth_data);
        if(ptr == NULL)
                {
@@ -148,34 +190,87 @@ static int dlfcn_unload(DSO *dso)
        return(1);
        }
 
-static int dlfcn_bind(DSO *dso, const char *symname, void **symptr)
+static void *dlfcn_bind_var(DSO *dso, const char *symname)
        {
        void *ptr, *sym;
 
-       if((dso == NULL) || (symptr == NULL) || (symname == NULL))
+       if((dso == NULL) || (symname == NULL))
                {
-               DSOerr(DSO_F_DLFCN_BIND,ERR_R_PASSED_NULL_PARAMETER);
-               return(0);
+               DSOerr(DSO_F_DLFCN_BIND_VAR,ERR_R_PASSED_NULL_PARAMETER);
+               return(NULL);
                }
        if(sk_num(dso->meth_data) < 1)
                {
-               DSOerr(DSO_F_DLFCN_BIND,DSO_R_STACK_ERROR);
-               return(0);
+               DSOerr(DSO_F_DLFCN_BIND_VAR,DSO_R_STACK_ERROR);
+               return(NULL);
                }
        ptr = (void *)sk_value(dso->meth_data, sk_num(dso->meth_data) - 1);
        if(ptr == NULL)
                {
-               DSOerr(DSO_F_DLFCN_BIND,DSO_R_NULL_HANDLE);
-               return(0);
+               DSOerr(DSO_F_DLFCN_BIND_VAR,DSO_R_NULL_HANDLE);
+               return(NULL);
                }
        sym = dlsym(ptr, symname);
        if(sym == NULL)
                {
-               DSOerr(DSO_F_DLFCN_BIND,DSO_R_SYM_FAILURE);
+               DSOerr(DSO_F_DLFCN_BIND_VAR,DSO_R_SYM_FAILURE);
+               return(NULL);
+               }
+       return(sym);
+       }
+
+static DSO_FUNC_TYPE dlfcn_bind_func(DSO *dso, const char *symname)
+       {
+       void *ptr;
+       DSO_FUNC_TYPE sym;
+
+       if((dso == NULL) || (symname == NULL))
+               {
+               DSOerr(DSO_F_DLFCN_BIND_FUNC,ERR_R_PASSED_NULL_PARAMETER);
+               return(NULL);
+               }
+       if(sk_num(dso->meth_data) < 1)
+               {
+               DSOerr(DSO_F_DLFCN_BIND_FUNC,DSO_R_STACK_ERROR);
+               return(NULL);
+               }
+       ptr = (void *)sk_value(dso->meth_data, sk_num(dso->meth_data) - 1);
+       if(ptr == NULL)
+               {
+               DSOerr(DSO_F_DLFCN_BIND_FUNC,DSO_R_NULL_HANDLE);
+               return(NULL);
+               }
+       sym = (DSO_FUNC_TYPE)dlsym(ptr, symname);
+       if(sym == NULL)
+               {
+               DSOerr(DSO_F_DLFCN_BIND_FUNC,DSO_R_SYM_FAILURE);
+               return(NULL);
+               }
+       return(sym);
+       }
+
+static long dlfcn_ctrl(DSO *dso, int cmd, long larg, void *parg)
+       {
+       if(dso == NULL)
+               {
+               DSOerr(DSO_F_DLFCN_CTRL,ERR_R_PASSED_NULL_PARAMETER);
+               return(-1);
+               }
+       switch(cmd)
+               {
+       case DSO_CTRL_GET_FLAGS:
+               return dso->flags;
+       case DSO_CTRL_SET_FLAGS:
+               dso->flags = (int)larg;
                return(0);
+       case DSO_CTRL_OR_FLAGS:
+               dso->flags |= (int)larg;
+               return(0);
+       default:
+               break;
                }
-       *symptr = sym;
-       return(1);
+       DSOerr(DSO_F_DLFCN_CTRL,DSO_R_UNKNOWN_COMMAND);
+       return(-1);
        }
 
 #endif /* DSO_DLFCN */