summaryrefslogtreecommitdiff
path: root/src/lib/libcrypto/dso/dso_dl.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib/libcrypto/dso/dso_dl.c')
-rw-r--r--src/lib/libcrypto/dso/dso_dl.c111
1 files changed, 72 insertions, 39 deletions
diff --git a/src/lib/libcrypto/dso/dso_dl.c b/src/lib/libcrypto/dso/dso_dl.c
index 69810fc3bb..195717e993 100644
--- a/src/lib/libcrypto/dso/dso_dl.c
+++ b/src/lib/libcrypto/dso/dso_dl.c
@@ -1,5 +1,5 @@
1/* dso_dl.c */ 1/* dso_dl.c */
2/* Written by Richard Levitte (levitte@openssl.org) for the OpenSSL 2/* Written by Richard Levitte (richard@levitte.org) for the OpenSSL
3 * project 2000. 3 * project 2000.
4 */ 4 */
5/* ==================================================================== 5/* ====================================================================
@@ -72,7 +72,7 @@ DSO_METHOD *DSO_METHOD_dl(void)
72/* Part of the hack in "dl_load" ... */ 72/* Part of the hack in "dl_load" ... */
73#define DSO_MAX_TRANSLATED_SIZE 256 73#define DSO_MAX_TRANSLATED_SIZE 256
74 74
75static int dl_load(DSO *dso, const char *filename); 75static int dl_load(DSO *dso);
76static int dl_unload(DSO *dso); 76static int dl_unload(DSO *dso);
77static void *dl_bind_var(DSO *dso, const char *symname); 77static void *dl_bind_var(DSO *dso, const char *symname);
78static DSO_FUNC_TYPE dl_bind_func(DSO *dso, const char *symname); 78static 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);
81static int dl_unbind_func(DSO *dso, char *symname, DSO_FUNC_TYPE symptr); 81static int dl_unbind_func(DSO *dso, char *symname, DSO_FUNC_TYPE symptr);
82static int dl_init(DSO *dso); 82static int dl_init(DSO *dso);
83static int dl_finish(DSO *dso); 83static int dl_finish(DSO *dso);
84#endif
85static int dl_ctrl(DSO *dso, int cmd, long larg, void *parg); 84static int dl_ctrl(DSO *dso, int cmd, long larg, void *parg);
85#endif
86static char *dl_name_converter(DSO *dso, const char *filename);
86 87
87static DSO_METHOD dso_meth_dl = { 88static DSO_METHOD dso_meth_dl = {
88 "OpenSSL 'dl' shared library method", 89 "OpenSSL 'dl' shared library method",
@@ -95,7 +96,8 @@ static DSO_METHOD dso_meth_dl = {
95 NULL, /* unbind_var */ 96 NULL, /* unbind_var */
96 NULL, /* unbind_func */ 97 NULL, /* unbind_func */
97#endif 98#endif
98 dl_ctrl, 99 NULL, /* ctrl */
100 dl_name_converter,
99 NULL, /* init */ 101 NULL, /* init */
100 NULL /* finish */ 102 NULL /* finish */
101 }; 103 };
@@ -111,35 +113,43 @@ DSO_METHOD *DSO_METHOD_dl(void)
111 * type so the cast is safe. 113 * type so the cast is safe.
112 */ 114 */
113 115
114static int dl_load(DSO *dso, const char *filename) 116static int dl_load(DSO *dso)
115 { 117 {
116 shl_t ptr; 118 shl_t ptr = NULL;
117 char translated[DSO_MAX_TRANSLATED_SIZE]; 119 /* We don't do any fancy retries or anything, just take the method's
118 int len; 120 * (or DSO's if it has the callback set) best translation of the
121 * platform-independant filename and try once with that. */
122 char *filename= DSO_convert_filename(dso, NULL);
119 123
120 /* The same comment as in dlfcn_load applies here. bleurgh. */ 124 if(filename == NULL)
121 len = strlen(filename);
122 if((dso->flags & DSO_FLAG_NAME_TRANSLATION) &&
123 (len + 6 < DSO_MAX_TRANSLATED_SIZE) &&
124 (strstr(filename, "/") == NULL))
125 { 125 {
126 sprintf(translated, "lib%s.so", filename); 126 DSOerr(DSO_F_DL_LOAD,DSO_R_NO_FILENAME);
127 ptr = shl_load(translated, BIND_IMMEDIATE, NULL); 127 goto err;
128 } 128 }
129 else 129 ptr = shl_load(filename, BIND_IMMEDIATE|DYNAMIC_PATH, NULL);
130 ptr = shl_load(filename, BIND_IMMEDIATE, NULL);
131 if(ptr == NULL) 130 if(ptr == NULL)
132 { 131 {
133 DSOerr(DSO_F_DL_LOAD,DSO_R_LOAD_FAILED); 132 DSOerr(DSO_F_DL_LOAD,DSO_R_LOAD_FAILED);
134 return(0); 133 ERR_add_error_data(4, "filename(", filename, "): ",
134 strerror(errno));
135 goto err;
135 } 136 }
136 if(!sk_push(dso->meth_data, (char *)ptr)) 137 if(!sk_push(dso->meth_data, (char *)ptr))
137 { 138 {
138 DSOerr(DSO_F_DL_LOAD,DSO_R_STACK_ERROR); 139 DSOerr(DSO_F_DL_LOAD,DSO_R_STACK_ERROR);
139 shl_unload(ptr); 140 goto err;
140 return(0);
141 } 141 }
142 /* Success, stick the converted filename we've loaded under into the DSO
143 * (it also serves as the indicator that we are currently loaded). */
144 dso->loaded_filename = filename;
142 return(1); 145 return(1);
146err:
147 /* Cleanup! */
148 if(filename != NULL)
149 OPENSSL_free(filename);
150 if(ptr != NULL)
151 shl_unload(ptr);
152 return(0);
143 } 153 }
144 154
145static int dl_unload(DSO *dso) 155static int dl_unload(DSO *dso)
@@ -187,9 +197,11 @@ static void *dl_bind_var(DSO *dso, const char *symname)
187 DSOerr(DSO_F_DL_BIND_VAR,DSO_R_NULL_HANDLE); 197 DSOerr(DSO_F_DL_BIND_VAR,DSO_R_NULL_HANDLE);
188 return(NULL); 198 return(NULL);
189 } 199 }
190 if (shl_findsym(ptr, symname, TYPE_UNDEFINED, &sym) < 0) 200 if (shl_findsym(&ptr, symname, TYPE_UNDEFINED, &sym) < 0)
191 { 201 {
192 DSOerr(DSO_F_DL_BIND_VAR,DSO_R_SYM_FAILURE); 202 DSOerr(DSO_F_DL_BIND_VAR,DSO_R_SYM_FAILURE);
203 ERR_add_error_data(4, "symname(", symname, "): ",
204 strerror(errno));
193 return(NULL); 205 return(NULL);
194 } 206 }
195 return(sym); 207 return(sym);
@@ -216,36 +228,57 @@ static DSO_FUNC_TYPE dl_bind_func(DSO *dso, const char *symname)
216 DSOerr(DSO_F_DL_BIND_FUNC,DSO_R_NULL_HANDLE); 228 DSOerr(DSO_F_DL_BIND_FUNC,DSO_R_NULL_HANDLE);
217 return(NULL); 229 return(NULL);
218 } 230 }
219 if (shl_findsym(ptr, symname, TYPE_UNDEFINED, &sym) < 0) 231 if (shl_findsym(&ptr, symname, TYPE_UNDEFINED, &sym) < 0)
220 { 232 {
221 DSOerr(DSO_F_DL_BIND_FUNC,DSO_R_SYM_FAILURE); 233 DSOerr(DSO_F_DL_BIND_FUNC,DSO_R_SYM_FAILURE);
234 ERR_add_error_data(4, "symname(", symname, "): ",
235 strerror(errno));
222 return(NULL); 236 return(NULL);
223 } 237 }
224 return((DSO_FUNC_TYPE)sym); 238 return((DSO_FUNC_TYPE)sym);
225 } 239 }
226 240
227static int dl_ctrl(DSO *dso, int cmd, long larg, void *parg) 241/* This function is identical to the one in dso_dlfcn.c, but as it is highly
242 * unlikely that both the "dl" *and* "dlfcn" variants are being compiled at the
243 * same time, there's no great duplicating the code. Figuring out an elegant
244 * way to share one copy of the code would be more difficult and would not
245 * leave the implementations independant. */
246#if defined(__hpux)
247static const char extension[] = ".sl";
248#else
249static const char extension[] = ".so";
250#endif
251static char *dl_name_converter(DSO *dso, const char *filename)
228 { 252 {
229 if(dso == NULL) 253 char *translated;
254 int len, rsize, transform;
255
256 len = strlen(filename);
257 rsize = len + 1;
258 transform = (strstr(filename, "/") == NULL);
230 { 259 {
231 DSOerr(DSO_F_DL_CTRL,ERR_R_PASSED_NULL_PARAMETER); 260 /* We will convert this to "%s.s?" or "lib%s.s?" */
232 return(-1); 261 rsize += strlen(extension);/* The length of ".s?" */
262 if ((DSO_flags(dso) & DSO_FLAG_NAME_TRANSLATION_EXT_ONLY) == 0)
263 rsize += 3; /* The length of "lib" */
233 } 264 }
234 switch(cmd) 265 translated = OPENSSL_malloc(rsize);
266 if(translated == NULL)
235 { 267 {
236 case DSO_CTRL_GET_FLAGS: 268 DSOerr(DSO_F_DL_NAME_CONVERTER,
237 return dso->flags; 269 DSO_R_NAME_TRANSLATION_FAILED);
238 case DSO_CTRL_SET_FLAGS: 270 return(NULL);
239 dso->flags = (int)larg; 271 }
240 return(0); 272 if(transform)
241 case DSO_CTRL_OR_FLAGS: 273 {
242 dso->flags |= (int)larg; 274 if ((DSO_flags(dso) & DSO_FLAG_NAME_TRANSLATION_EXT_ONLY) == 0)
243 return(0); 275 sprintf(translated, "lib%s%s", filename, extension);
244 default: 276 else
245 break; 277 sprintf(translated, "%s%s", filename, extension);
246 } 278 }
247 DSOerr(DSO_F_DL_CTRL,DSO_R_UNKNOWN_COMMAND); 279 else
248 return(-1); 280 sprintf(translated, "%s", filename);
281 return(translated);
249 } 282 }
250 283
251#endif /* DSO_DL */ 284#endif /* DSO_DL */