This change to the "dl", "dlfcn", and "win32" DSO_METHODs adds the filename

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

diff --git a/crypto/dso/dso_dl.c b/crypto/dso/dso_dl.c
index 69810fc3bb93d4958880d68484cc647a649074d4..a831877c07fa31cfa3afbd19d0813ce00e1db11d 100644 (file)
--- a/crypto/dso/dso_dl.c
+++ b/crypto/dso/dso_dl.c
@@ -72,7 +72,7 @@ DSO_METHOD *DSO_METHOD_dl(void)
 /* Part of the hack in "dl_load" ... */
 #define DSO_MAX_TRANSLATED_SIZE 256
 
 /* Part of the hack in "dl_load" ... */
 #define DSO_MAX_TRANSLATED_SIZE 256
 

-static int dl_load(DSO *dso, const char *filename);
+static int dl_load(DSO *dso);

 static int dl_unload(DSO *dso);
 static void *dl_bind_var(DSO *dso, const char *symname);
 static DSO_FUNC_TYPE dl_bind_func(DSO *dso, const char *symname);
 static int dl_unload(DSO *dso);
 static void *dl_bind_var(DSO *dso, const char *symname);
 static DSO_FUNC_TYPE dl_bind_func(DSO *dso, const char *symname);


@@ -81,8 +81,9 @@ static int dl_unbind_var(DSO *dso, char *symname, void *symptr);
 static int dl_unbind_func(DSO *dso, char *symname, DSO_FUNC_TYPE symptr);
 static int dl_init(DSO *dso);
 static int dl_finish(DSO *dso);
 static int dl_unbind_func(DSO *dso, char *symname, DSO_FUNC_TYPE symptr);
 static int dl_init(DSO *dso);
 static int dl_finish(DSO *dso);

-#endif

 static int dl_ctrl(DSO *dso, int cmd, long larg, void *parg);
 static int dl_ctrl(DSO *dso, int cmd, long larg, void *parg);

+#endif
+static char *dl_name_converter(DSO *dso, const char *filename);

 
 static DSO_METHOD dso_meth_dl = {
        "OpenSSL 'dl' shared library method",
 
 static DSO_METHOD dso_meth_dl = {
        "OpenSSL 'dl' shared library method",


@@ -95,7 +96,8 @@ static DSO_METHOD dso_meth_dl = {
        NULL, /* unbind_var */
        NULL, /* unbind_func */
 #endif
        NULL, /* unbind_var */
        NULL, /* unbind_func */
 #endif

-       dl_ctrl,
+       NULL, /* ctrl */
+       dl_name_converter,

        NULL, /* init */
        NULL  /* finish */
        };
        NULL, /* init */
        NULL  /* finish */
        };


@@ -111,35 +113,42 @@ DSO_METHOD *DSO_METHOD_dl(void)
  * type so the cast is safe.
  */
 
  * type so the cast is safe.
  */
 

-static int dl_load(DSO *dso, const char *filename)
+static int dl_load(DSO *dso)

        {
        {

-       shl_t ptr;
-       char translated[DSO_MAX_TRANSLATED_SIZE];
-       int len;
+       shl_t ptr = NULL;
+       /* We don't do any fancy retries or anything, just take the method's
+        * (or DSO's if it has the callback set) best translation of the
+        * platform-independant filename and try once with that. */
+       char *filename= DSO_convert_filename(dso, NULL);

 
 

-       /* The same comment as in dlfcn_load applies here. bleurgh. */
-       len = strlen(filename);
-       if((dso->flags & DSO_FLAG_NAME_TRANSLATION) &&
-                       (len + 6 < DSO_MAX_TRANSLATED_SIZE) &&
-                       (strstr(filename, "/") == NULL))
+       if(filename == NULL)

                {
                {

-               sprintf(translated, "lib%s.so", filename);
-               ptr = shl_load(translated, BIND_IMMEDIATE, NULL);
+               DSOerr(DSO_F_DL_LOAD,DSO_R_NO_FILENAME);
+               goto err;

                }
                }

-       else
-               ptr = shl_load(filename, BIND_IMMEDIATE, NULL);
+       ptr = shl_load(filename, BIND_IMMEDIATE|DYNAMIC_PATH, NULL);

        if(ptr == NULL)
                {
                DSOerr(DSO_F_DL_LOAD,DSO_R_LOAD_FAILED);
        if(ptr == NULL)
                {
                DSOerr(DSO_F_DL_LOAD,DSO_R_LOAD_FAILED);

-               return(0);
+               ERR_add_error_data(3, "filename(", filename, ")");
+               goto err;

                }
        if(!sk_push(dso->meth_data, (char *)ptr))
                {
                DSOerr(DSO_F_DL_LOAD,DSO_R_STACK_ERROR);
                }
        if(!sk_push(dso->meth_data, (char *)ptr))
                {
                DSOerr(DSO_F_DL_LOAD,DSO_R_STACK_ERROR);

-               shl_unload(ptr);
-               return(0);
+               goto err;

                }
                }

+       /* Success, stick the converted filename we've loaded under into the DSO
+        * (it also serves as the indicator that we are currently loaded). */
+       dso->loaded_filename = filename;

        return(1);
        return(1);

+err:
+       /* Cleanup! */
+       if(filename != NULL)
+               OPENSSL_free(filename);
+       if(ptr != NULL)
+               shl_unload(ptr);
+       return(0);

        }
 
 static int dl_unload(DSO *dso)
        }
 
 static int dl_unload(DSO *dso)


@@ -187,9 +196,10 @@ static void *dl_bind_var(DSO *dso, const char *symname)
                DSOerr(DSO_F_DL_BIND_VAR,DSO_R_NULL_HANDLE);
                return(NULL);
                }
                DSOerr(DSO_F_DL_BIND_VAR,DSO_R_NULL_HANDLE);
                return(NULL);
                }

-       if (shl_findsym(ptr, symname, TYPE_UNDEFINED, &sym) < 0)
+       if (shl_findsym(&ptr, symname, TYPE_UNDEFINED, &sym) < 0)

                {
                DSOerr(DSO_F_DL_BIND_VAR,DSO_R_SYM_FAILURE);
                {
                DSOerr(DSO_F_DL_BIND_VAR,DSO_R_SYM_FAILURE);

+               ERR_add_error_data(3, "symname(", symname, ")");

                return(NULL);
                }
        return(sym);
                return(NULL);
                }
        return(sym);


@@ -216,36 +226,56 @@ static DSO_FUNC_TYPE dl_bind_func(DSO *dso, const char *symname)
                DSOerr(DSO_F_DL_BIND_FUNC,DSO_R_NULL_HANDLE);
                return(NULL);
                }
                DSOerr(DSO_F_DL_BIND_FUNC,DSO_R_NULL_HANDLE);
                return(NULL);
                }

-       if (shl_findsym(ptr, symname, TYPE_UNDEFINED, &sym) < 0)
+       if (shl_findsym(&ptr, symname, TYPE_UNDEFINED, &sym) < 0)

                {
                DSOerr(DSO_F_DL_BIND_FUNC,DSO_R_SYM_FAILURE);
                {
                DSOerr(DSO_F_DL_BIND_FUNC,DSO_R_SYM_FAILURE);

+               ERR_add_error_data(3, "symname(", symname, ")");

                return(NULL);
                }
        return((DSO_FUNC_TYPE)sym);
        }
 
                return(NULL);
                }
        return((DSO_FUNC_TYPE)sym);
        }
 

-static int dl_ctrl(DSO *dso, int cmd, long larg, void *parg)
+/* This function is identical to the one in dso_dlfcn.c, but as it is highly
+ * unlikely that both the "dl" *and* "dlfcn" variants are being compiled at the
+ * same time, there's no great duplicating the code. Figuring out an elegant 
+ * way to share one copy of the code would be more difficult and would not
+ * leave the implementations independant. */
+#if defined(__hpux)
+static const char extension[] = ".sl";
+#else
+static const char extension[] = ".so";
+#endif
+static char *dl_name_converter(DSO *dso, const char *filename)

        {
        {

-       if(dso == NULL)
+       char *translated;
+       int len, rsize, transform;
+
+       len = strlen(filename);
+       rsize = len + 1;
+       transform = (strstr(filename, "/") == NULL);

                {
                {

-               DSOerr(DSO_F_DL_CTRL,ERR_R_PASSED_NULL_PARAMETER);
-               return(-1);
+               /* We will convert this to "%s.s?" or "lib%s.s?" */
+               rsize += strlen(extension);/* The length of ".s?" */
+               if ((DSO_flags(dso) & DSO_FLAG_NAME_TRANSLATION_EXT_ONLY) == 0)
+                       rsize += 3; /* The length of "lib" */

                }
                }

-       switch(cmd)
+       translated = OPENSSL_malloc(rsize);
+       if(translated == NULL)

                {
                {

-       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;
+               DSOerr(DSO_F_DL_NAME_CONVERTER,
+                               DSO_R_NAME_TRANSLATION_FAILED); 
+               return(NULL);   
+               }
+       if(transform)
+               {
+               if ((DSO_flags(dso) & DSO_FLAG_NAME_TRANSLATION_EXT_ONLY) == 0)
+                       sprintf(translated, "lib%s%s", filename, extension);
+               else
+                       sprintf(translated, "%s%s", filename, extension);

                }
                }

-       DSOerr(DSO_F_DL_CTRL,DSO_R_UNKNOWN_COMMAND);
-       return(-1);
+       else
+               sprintf(translated, "%s", filename);
+       return(translated);

        }
 
 #endif /* DSO_DL */
        }
 
 #endif /* DSO_DL */