This change facilitates name translation for shared libraries. The

technique used is far from perfect and alternatives are welcome.
Basically if the translation flag is set, the string is not too
long, and there appears to be no path information in the string,
then it is converted to whatever the standard should be for the
DSO_METHOD in question, eg;
    blah --> libblah.so   on *nix, and
    blah --> blah.dll     on win32.

This change also introduces the DSO_ctrl() function that is used
by the name translation stuff.

1 files changed, 42 insertions, 2 deletions

diff --git a/crypto/dso/dso_dl.c b/crypto/dso/dso_dl.c
index e6e508d434..a4152e7723 100644
--- a/crypto/dso/dso_dl.c
+++ b/crypto/dso/dso_dl.c
@@ -69,6 +69,9 @@ DSO_METHOD *DSO_METHOD_dl(void)
 
 #include <dl.h>
 
+/* 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_unload(DSO *dso);
 static int dl_bind(DSO *dso, const char *symname, void **symptr);
@@ -77,6 +80,7 @@ static int dl_unbind(DSO *dso, char *symname, void *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 DSO_METHOD dso_meth_dl = {
 	"OpenSSL 'dl' shared library method",
@@ -87,6 +91,7 @@ static DSO_METHOD dso_meth_dl = {
 #if 0
 	NULL, /* unbind */
 #endif
+	dl_ctrl,
 	NULL, /* init */
 	NULL  /* finish */
 	};
@@ -105,8 +110,20 @@ DSO_METHOD *DSO_METHOD_dl(void)
 static int dl_load(DSO *dso, const char *filename)
 	{
 	shl_t ptr;
+	char translated[DSO_MAX_TRANSLATED_SIZE];
+	int len;
 
-	ptr = shl_load(filename, BIND_IMMEDIATE, 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))
+		{
+		sprintf(translated, "lib%s.so", filename);
+		ptr = shl_load(translated, BIND_IMMEDIATE, NULL);
+		}
+	else
+		ptr = shl_load(filename, BIND_IMMEDIATE, NULL);
 	if(ptr == NULL)
 		{
 		DSOerr(DSO_F_DL_LOAD,DSO_R_LOAD_FAILED);
@@ -163,7 +180,6 @@ static int dl_bind(DSO *dso, const char *symname, void **symptr)
 		DSOerr(DSO_F_DL_BIND,DSO_R_STACK_ERROR);
 		return(0);
 		}
-	/* Is this actually legal? */
 	ptr = (shl_t)sk_value(dso->meth_data, sk_num(dso->meth_data) - 1);
 	if(ptr == NULL)
 		{
@@ -179,4 +195,28 @@ static int dl_bind(DSO *dso, const char *symname, void **symptr)
 	return(1);
 	}
 
+static int dl_ctrl(DSO *dso, int cmd, long larg, void *parg)
+	{
+	if(dso == NULL)
+		{
+		DSOerr(DSO_F_DL_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;
+		}
+	DSOerr(DSO_F_DL_CTRL,DSO_R_UNKNOWN_COMMAND);
+	return(-1);
+	}
+
 #endif /* DSO_DL */