2002-07-15 15:35:40 +00:00
|
|
|
/* dso_win32.c -*- mode:C; c-file-style: "eay" -*- */
|
2000-04-04 21:57:11 +00:00
|
|
|
/* Written by Geoff Thorpe (geoff@geoffthorpe.net) for the OpenSSL
|
|
|
|
* project 2000.
|
|
|
|
*/
|
|
|
|
/* ====================================================================
|
|
|
|
* Copyright (c) 2000 The OpenSSL Project. All rights reserved.
|
|
|
|
*
|
|
|
|
* Redistribution and use in source and binary forms, with or without
|
|
|
|
* modification, are permitted provided that the following conditions
|
|
|
|
* are met:
|
|
|
|
*
|
|
|
|
* 1. Redistributions of source code must retain the above copyright
|
|
|
|
* notice, this list of conditions and the following disclaimer.
|
|
|
|
*
|
|
|
|
* 2. Redistributions in binary form must reproduce the above copyright
|
|
|
|
* notice, this list of conditions and the following disclaimer in
|
|
|
|
* the documentation and/or other materials provided with the
|
|
|
|
* distribution.
|
|
|
|
*
|
|
|
|
* 3. All advertising materials mentioning features or use of this
|
|
|
|
* software must display the following acknowledgment:
|
|
|
|
* "This product includes software developed by the OpenSSL Project
|
|
|
|
* for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
|
|
|
|
*
|
|
|
|
* 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
|
|
|
|
* endorse or promote products derived from this software without
|
|
|
|
* prior written permission. For written permission, please contact
|
|
|
|
* licensing@OpenSSL.org.
|
|
|
|
*
|
|
|
|
* 5. Products derived from this software may not be called "OpenSSL"
|
|
|
|
* nor may "OpenSSL" appear in their names without prior written
|
|
|
|
* permission of the OpenSSL Project.
|
|
|
|
*
|
|
|
|
* 6. Redistributions of any form whatsoever must retain the following
|
|
|
|
* acknowledgment:
|
|
|
|
* "This product includes software developed by the OpenSSL Project
|
|
|
|
* for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
|
|
|
|
*
|
|
|
|
* THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
|
|
|
|
* EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
|
|
|
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
|
|
|
|
* PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE OpenSSL PROJECT OR
|
|
|
|
* ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
|
|
|
|
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
|
|
|
|
* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
|
|
|
|
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
|
|
|
|
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
|
|
|
|
* STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
|
|
|
|
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
|
|
|
|
* OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
|
|
* ====================================================================
|
|
|
|
*
|
|
|
|
* This product includes cryptographic software written by Eric Young
|
|
|
|
* (eay@cryptsoft.com). This product includes software written by Tim
|
|
|
|
* Hudson (tjh@cryptsoft.com).
|
|
|
|
*
|
|
|
|
*/
|
|
|
|
|
|
|
|
#include <stdio.h>
|
2000-05-01 19:49:41 +00:00
|
|
|
#include <string.h>
|
2000-04-04 21:57:11 +00:00
|
|
|
#include "cryptlib.h"
|
|
|
|
#include <openssl/dso.h>
|
|
|
|
|
2005-03-12 11:28:41 +00:00
|
|
|
#if !defined(DSO_WIN32)
|
2000-04-04 21:57:11 +00:00
|
|
|
DSO_METHOD *DSO_METHOD_win32(void)
|
|
|
|
{
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
#else
|
|
|
|
|
2005-06-27 21:21:12 +00:00
|
|
|
#ifdef _WIN32_WCE
|
|
|
|
# if _WIN32_WCE < 300
|
|
|
|
static FARPROC GetProcAddressA(HMODULE hModule,LPCSTR lpProcName)
|
|
|
|
{
|
|
|
|
WCHAR lpProcNameW[64];
|
|
|
|
int i;
|
|
|
|
|
|
|
|
for (i=0;lpProcName[i] && i<64;i++)
|
|
|
|
lpProcNameW[i] = (WCHAR)lpProcName[i];
|
|
|
|
if (i==64) return NULL;
|
|
|
|
lpProcNameW[i] = 0;
|
|
|
|
|
|
|
|
return GetProcAddressW(hModule,lpProcNameW);
|
|
|
|
}
|
|
|
|
# endif
|
|
|
|
# undef GetProcAddress
|
|
|
|
# define GetProcAddress GetProcAddressA
|
2005-08-02 11:03:42 +00:00
|
|
|
|
2005-08-03 20:04:05 +00:00
|
|
|
static HINSTANCE LoadLibraryA(LPCSTR lpLibFileName)
|
2005-08-02 11:03:42 +00:00
|
|
|
{
|
|
|
|
WCHAR *fnamw;
|
|
|
|
size_t len_0=strlen(lpLibFileName)+1,i;
|
|
|
|
|
|
|
|
#ifdef _MSC_VER
|
2005-08-03 20:04:05 +00:00
|
|
|
fnamw = (WCHAR *)_alloca (len_0*sizeof(WCHAR));
|
2005-08-02 11:03:42 +00:00
|
|
|
#else
|
|
|
|
fnamw = (WCHAR *)alloca (len_0*sizeof(WCHAR));
|
|
|
|
#endif
|
|
|
|
if (fnamw == NULL) return NULL;
|
|
|
|
|
|
|
|
#if defined(_WIN32_WCE) && _WIN32_WCE>=101
|
|
|
|
if (!MultiByteToWideChar(CP_ACP,0,lpLibFileName,len_0,fnamw,len_0))
|
|
|
|
#endif
|
|
|
|
for (i=0;i<len_0;i++) fnamw[i]=(WCHAR)lpLibFileName[i];
|
|
|
|
|
|
|
|
return LoadLibraryW(fnamw);
|
|
|
|
}
|
2005-06-27 21:21:12 +00:00
|
|
|
#endif
|
|
|
|
|
2000-04-19 21:45:17 +00:00
|
|
|
/* Part of the hack in "win32_load" ... */
|
|
|
|
#define DSO_MAX_TRANSLATED_SIZE 256
|
|
|
|
|
This changes the behaviour of the DSO mechanism for determining an
appropriate filename translation on the host system. Apart from this point,
users should also note that there's a slight change in the API functions
too. The DSO now contains its own to-be-converted filename
("dso->filename"), and at the time the DSO loads the "dso->loaded_filename"
value is set to the translated form. As such, this also provides an impicit
way of determining if the DSO is currently loaded or not. Except, perhaps,
VMS .... :-)
The various DSO_METHODs have been updated for this mechanism except VMS
which is deliberately broken for now, Richard is going to look at how to
fit it in (the source comments in there explain "the issue").
Basically, the new callback scheme allows the filename conversion to
(a) be turned off altogether through the use of the
DSO_FLAG_NO_NAME_TRANSLATION flag,
(b) be handled in the default way using the default DSO_METHOD's converter
(c) overriden per-DSO by setting the override callback
(d) a mix of (b) and (c) - eg. implement an override callback that;
(i) checks if we're win32 "if(strstr(dso->meth->name, "win32"))..."
and if so, convert "blah" into "blah32.dll" (the default is
otherwise to make it "blah.dll").
(ii) default to the normal behaviour - eg. we're not on win32, so
finish with (return dso->meth->dso_name_converter(dso,NULL)).
(e) be retried a number of times by writing a new DSO_METHOD where the
"dso_load()" handler will call the converter repeatedly. Then the
custom converter could use state information in the DSO to suggest
different conversions or paths each time it is invoked.
2000-10-26 17:38:59 +00:00
|
|
|
static int win32_load(DSO *dso);
|
2000-04-04 21:57:11 +00:00
|
|
|
static int win32_unload(DSO *dso);
|
2000-06-16 10:45:36 +00:00
|
|
|
static void *win32_bind_var(DSO *dso, const char *symname);
|
|
|
|
static DSO_FUNC_TYPE win32_bind_func(DSO *dso, const char *symname);
|
2000-04-04 21:57:11 +00:00
|
|
|
#if 0
|
2000-06-16 10:45:36 +00:00
|
|
|
static int win32_unbind_var(DSO *dso, char *symname, void *symptr);
|
|
|
|
static int win32_unbind_func(DSO *dso, char *symname, DSO_FUNC_TYPE symptr);
|
2000-04-04 21:57:11 +00:00
|
|
|
static int win32_init(DSO *dso);
|
|
|
|
static int win32_finish(DSO *dso);
|
2000-04-19 21:45:17 +00:00
|
|
|
static long win32_ctrl(DSO *dso, int cmd, long larg, void *parg);
|
2000-10-08 22:36:49 +00:00
|
|
|
#endif
|
This changes the behaviour of the DSO mechanism for determining an
appropriate filename translation on the host system. Apart from this point,
users should also note that there's a slight change in the API functions
too. The DSO now contains its own to-be-converted filename
("dso->filename"), and at the time the DSO loads the "dso->loaded_filename"
value is set to the translated form. As such, this also provides an impicit
way of determining if the DSO is currently loaded or not. Except, perhaps,
VMS .... :-)
The various DSO_METHODs have been updated for this mechanism except VMS
which is deliberately broken for now, Richard is going to look at how to
fit it in (the source comments in there explain "the issue").
Basically, the new callback scheme allows the filename conversion to
(a) be turned off altogether through the use of the
DSO_FLAG_NO_NAME_TRANSLATION flag,
(b) be handled in the default way using the default DSO_METHOD's converter
(c) overriden per-DSO by setting the override callback
(d) a mix of (b) and (c) - eg. implement an override callback that;
(i) checks if we're win32 "if(strstr(dso->meth->name, "win32"))..."
and if so, convert "blah" into "blah32.dll" (the default is
otherwise to make it "blah.dll").
(ii) default to the normal behaviour - eg. we're not on win32, so
finish with (return dso->meth->dso_name_converter(dso,NULL)).
(e) be retried a number of times by writing a new DSO_METHOD where the
"dso_load()" handler will call the converter repeatedly. Then the
custom converter could use state information in the DSO to suggest
different conversions or paths each time it is invoked.
2000-10-26 17:38:59 +00:00
|
|
|
static char *win32_name_converter(DSO *dso, const char *filename);
|
2002-07-15 15:35:40 +00:00
|
|
|
static char *win32_merger(DSO *dso, const char *filespec1,
|
|
|
|
const char *filespec2);
|
2000-04-04 21:57:11 +00:00
|
|
|
|
2002-10-06 12:14:55 +00:00
|
|
|
static const char *openssl_strnchr(const char *string, int c, size_t len);
|
|
|
|
|
2000-04-04 21:57:11 +00:00
|
|
|
static DSO_METHOD dso_meth_win32 = {
|
|
|
|
"OpenSSL 'win32' shared library method",
|
|
|
|
win32_load,
|
|
|
|
win32_unload,
|
2000-06-16 10:45:36 +00:00
|
|
|
win32_bind_var,
|
|
|
|
win32_bind_func,
|
2000-04-04 21:57:11 +00:00
|
|
|
/* For now, "unbind" doesn't exist */
|
|
|
|
#if 0
|
2000-06-16 10:45:36 +00:00
|
|
|
NULL, /* unbind_var */
|
|
|
|
NULL, /* unbind_func */
|
2000-04-04 21:57:11 +00:00
|
|
|
#endif
|
2000-10-08 22:36:49 +00:00
|
|
|
NULL, /* ctrl */
|
This changes the behaviour of the DSO mechanism for determining an
appropriate filename translation on the host system. Apart from this point,
users should also note that there's a slight change in the API functions
too. The DSO now contains its own to-be-converted filename
("dso->filename"), and at the time the DSO loads the "dso->loaded_filename"
value is set to the translated form. As such, this also provides an impicit
way of determining if the DSO is currently loaded or not. Except, perhaps,
VMS .... :-)
The various DSO_METHODs have been updated for this mechanism except VMS
which is deliberately broken for now, Richard is going to look at how to
fit it in (the source comments in there explain "the issue").
Basically, the new callback scheme allows the filename conversion to
(a) be turned off altogether through the use of the
DSO_FLAG_NO_NAME_TRANSLATION flag,
(b) be handled in the default way using the default DSO_METHOD's converter
(c) overriden per-DSO by setting the override callback
(d) a mix of (b) and (c) - eg. implement an override callback that;
(i) checks if we're win32 "if(strstr(dso->meth->name, "win32"))..."
and if so, convert "blah" into "blah32.dll" (the default is
otherwise to make it "blah.dll").
(ii) default to the normal behaviour - eg. we're not on win32, so
finish with (return dso->meth->dso_name_converter(dso,NULL)).
(e) be retried a number of times by writing a new DSO_METHOD where the
"dso_load()" handler will call the converter repeatedly. Then the
custom converter could use state information in the DSO to suggest
different conversions or paths each time it is invoked.
2000-10-26 17:38:59 +00:00
|
|
|
win32_name_converter,
|
2002-07-15 15:35:40 +00:00
|
|
|
win32_merger,
|
2000-04-04 21:57:11 +00:00
|
|
|
NULL, /* init */
|
|
|
|
NULL /* finish */
|
|
|
|
};
|
|
|
|
|
|
|
|
DSO_METHOD *DSO_METHOD_win32(void)
|
|
|
|
{
|
|
|
|
return(&dso_meth_win32);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* For this DSO_METHOD, our meth_data STACK will contain;
|
|
|
|
* (i) a pointer to the handle (HINSTANCE) returned from
|
2000-04-19 21:45:17 +00:00
|
|
|
* LoadLibrary(), and copied.
|
2000-04-04 21:57:11 +00:00
|
|
|
*/
|
|
|
|
|
This changes the behaviour of the DSO mechanism for determining an
appropriate filename translation on the host system. Apart from this point,
users should also note that there's a slight change in the API functions
too. The DSO now contains its own to-be-converted filename
("dso->filename"), and at the time the DSO loads the "dso->loaded_filename"
value is set to the translated form. As such, this also provides an impicit
way of determining if the DSO is currently loaded or not. Except, perhaps,
VMS .... :-)
The various DSO_METHODs have been updated for this mechanism except VMS
which is deliberately broken for now, Richard is going to look at how to
fit it in (the source comments in there explain "the issue").
Basically, the new callback scheme allows the filename conversion to
(a) be turned off altogether through the use of the
DSO_FLAG_NO_NAME_TRANSLATION flag,
(b) be handled in the default way using the default DSO_METHOD's converter
(c) overriden per-DSO by setting the override callback
(d) a mix of (b) and (c) - eg. implement an override callback that;
(i) checks if we're win32 "if(strstr(dso->meth->name, "win32"))..."
and if so, convert "blah" into "blah32.dll" (the default is
otherwise to make it "blah.dll").
(ii) default to the normal behaviour - eg. we're not on win32, so
finish with (return dso->meth->dso_name_converter(dso,NULL)).
(e) be retried a number of times by writing a new DSO_METHOD where the
"dso_load()" handler will call the converter repeatedly. Then the
custom converter could use state information in the DSO to suggest
different conversions or paths each time it is invoked.
2000-10-26 17:38:59 +00:00
|
|
|
static int win32_load(DSO *dso)
|
2000-04-04 21:57:11 +00:00
|
|
|
{
|
This changes the behaviour of the DSO mechanism for determining an
appropriate filename translation on the host system. Apart from this point,
users should also note that there's a slight change in the API functions
too. The DSO now contains its own to-be-converted filename
("dso->filename"), and at the time the DSO loads the "dso->loaded_filename"
value is set to the translated form. As such, this also provides an impicit
way of determining if the DSO is currently loaded or not. Except, perhaps,
VMS .... :-)
The various DSO_METHODs have been updated for this mechanism except VMS
which is deliberately broken for now, Richard is going to look at how to
fit it in (the source comments in there explain "the issue").
Basically, the new callback scheme allows the filename conversion to
(a) be turned off altogether through the use of the
DSO_FLAG_NO_NAME_TRANSLATION flag,
(b) be handled in the default way using the default DSO_METHOD's converter
(c) overriden per-DSO by setting the override callback
(d) a mix of (b) and (c) - eg. implement an override callback that;
(i) checks if we're win32 "if(strstr(dso->meth->name, "win32"))..."
and if so, convert "blah" into "blah32.dll" (the default is
otherwise to make it "blah.dll").
(ii) default to the normal behaviour - eg. we're not on win32, so
finish with (return dso->meth->dso_name_converter(dso,NULL)).
(e) be retried a number of times by writing a new DSO_METHOD where the
"dso_load()" handler will call the converter repeatedly. Then the
custom converter could use state information in the DSO to suggest
different conversions or paths each time it is invoked.
2000-10-26 17:38:59 +00:00
|
|
|
HINSTANCE h = NULL, *p = NULL;
|
|
|
|
/* See applicable comments from dso_dl.c */
|
|
|
|
char *filename = DSO_convert_filename(dso, NULL);
|
|
|
|
|
|
|
|
if(filename == NULL)
|
2000-04-19 21:45:17 +00:00
|
|
|
{
|
This changes the behaviour of the DSO mechanism for determining an
appropriate filename translation on the host system. Apart from this point,
users should also note that there's a slight change in the API functions
too. The DSO now contains its own to-be-converted filename
("dso->filename"), and at the time the DSO loads the "dso->loaded_filename"
value is set to the translated form. As such, this also provides an impicit
way of determining if the DSO is currently loaded or not. Except, perhaps,
VMS .... :-)
The various DSO_METHODs have been updated for this mechanism except VMS
which is deliberately broken for now, Richard is going to look at how to
fit it in (the source comments in there explain "the issue").
Basically, the new callback scheme allows the filename conversion to
(a) be turned off altogether through the use of the
DSO_FLAG_NO_NAME_TRANSLATION flag,
(b) be handled in the default way using the default DSO_METHOD's converter
(c) overriden per-DSO by setting the override callback
(d) a mix of (b) and (c) - eg. implement an override callback that;
(i) checks if we're win32 "if(strstr(dso->meth->name, "win32"))..."
and if so, convert "blah" into "blah32.dll" (the default is
otherwise to make it "blah.dll").
(ii) default to the normal behaviour - eg. we're not on win32, so
finish with (return dso->meth->dso_name_converter(dso,NULL)).
(e) be retried a number of times by writing a new DSO_METHOD where the
"dso_load()" handler will call the converter repeatedly. Then the
custom converter could use state information in the DSO to suggest
different conversions or paths each time it is invoked.
2000-10-26 17:38:59 +00:00
|
|
|
DSOerr(DSO_F_WIN32_LOAD,DSO_R_NO_FILENAME);
|
|
|
|
goto err;
|
2000-04-19 21:45:17 +00:00
|
|
|
}
|
2005-06-27 21:21:12 +00:00
|
|
|
h = LoadLibraryA(filename);
|
2000-04-04 21:57:11 +00:00
|
|
|
if(h == NULL)
|
|
|
|
{
|
|
|
|
DSOerr(DSO_F_WIN32_LOAD,DSO_R_LOAD_FAILED);
|
2001-04-25 22:40:55 +00:00
|
|
|
ERR_add_error_data(3, "filename(", filename, ")");
|
This changes the behaviour of the DSO mechanism for determining an
appropriate filename translation on the host system. Apart from this point,
users should also note that there's a slight change in the API functions
too. The DSO now contains its own to-be-converted filename
("dso->filename"), and at the time the DSO loads the "dso->loaded_filename"
value is set to the translated form. As such, this also provides an impicit
way of determining if the DSO is currently loaded or not. Except, perhaps,
VMS .... :-)
The various DSO_METHODs have been updated for this mechanism except VMS
which is deliberately broken for now, Richard is going to look at how to
fit it in (the source comments in there explain "the issue").
Basically, the new callback scheme allows the filename conversion to
(a) be turned off altogether through the use of the
DSO_FLAG_NO_NAME_TRANSLATION flag,
(b) be handled in the default way using the default DSO_METHOD's converter
(c) overriden per-DSO by setting the override callback
(d) a mix of (b) and (c) - eg. implement an override callback that;
(i) checks if we're win32 "if(strstr(dso->meth->name, "win32"))..."
and if so, convert "blah" into "blah32.dll" (the default is
otherwise to make it "blah.dll").
(ii) default to the normal behaviour - eg. we're not on win32, so
finish with (return dso->meth->dso_name_converter(dso,NULL)).
(e) be retried a number of times by writing a new DSO_METHOD where the
"dso_load()" handler will call the converter repeatedly. Then the
custom converter could use state information in the DSO to suggest
different conversions or paths each time it is invoked.
2000-10-26 17:38:59 +00:00
|
|
|
goto err;
|
2000-04-04 21:57:11 +00:00
|
|
|
}
|
2000-06-01 22:19:21 +00:00
|
|
|
p = (HINSTANCE *)OPENSSL_malloc(sizeof(HINSTANCE));
|
2000-04-04 21:57:11 +00:00
|
|
|
if(p == NULL)
|
|
|
|
{
|
|
|
|
DSOerr(DSO_F_WIN32_LOAD,ERR_R_MALLOC_FAILURE);
|
This changes the behaviour of the DSO mechanism for determining an
appropriate filename translation on the host system. Apart from this point,
users should also note that there's a slight change in the API functions
too. The DSO now contains its own to-be-converted filename
("dso->filename"), and at the time the DSO loads the "dso->loaded_filename"
value is set to the translated form. As such, this also provides an impicit
way of determining if the DSO is currently loaded or not. Except, perhaps,
VMS .... :-)
The various DSO_METHODs have been updated for this mechanism except VMS
which is deliberately broken for now, Richard is going to look at how to
fit it in (the source comments in there explain "the issue").
Basically, the new callback scheme allows the filename conversion to
(a) be turned off altogether through the use of the
DSO_FLAG_NO_NAME_TRANSLATION flag,
(b) be handled in the default way using the default DSO_METHOD's converter
(c) overriden per-DSO by setting the override callback
(d) a mix of (b) and (c) - eg. implement an override callback that;
(i) checks if we're win32 "if(strstr(dso->meth->name, "win32"))..."
and if so, convert "blah" into "blah32.dll" (the default is
otherwise to make it "blah.dll").
(ii) default to the normal behaviour - eg. we're not on win32, so
finish with (return dso->meth->dso_name_converter(dso,NULL)).
(e) be retried a number of times by writing a new DSO_METHOD where the
"dso_load()" handler will call the converter repeatedly. Then the
custom converter could use state information in the DSO to suggest
different conversions or paths each time it is invoked.
2000-10-26 17:38:59 +00:00
|
|
|
goto err;
|
2000-04-04 21:57:11 +00:00
|
|
|
}
|
|
|
|
*p = h;
|
|
|
|
if(!sk_push(dso->meth_data, (char *)p))
|
|
|
|
{
|
|
|
|
DSOerr(DSO_F_WIN32_LOAD,DSO_R_STACK_ERROR);
|
This changes the behaviour of the DSO mechanism for determining an
appropriate filename translation on the host system. Apart from this point,
users should also note that there's a slight change in the API functions
too. The DSO now contains its own to-be-converted filename
("dso->filename"), and at the time the DSO loads the "dso->loaded_filename"
value is set to the translated form. As such, this also provides an impicit
way of determining if the DSO is currently loaded or not. Except, perhaps,
VMS .... :-)
The various DSO_METHODs have been updated for this mechanism except VMS
which is deliberately broken for now, Richard is going to look at how to
fit it in (the source comments in there explain "the issue").
Basically, the new callback scheme allows the filename conversion to
(a) be turned off altogether through the use of the
DSO_FLAG_NO_NAME_TRANSLATION flag,
(b) be handled in the default way using the default DSO_METHOD's converter
(c) overriden per-DSO by setting the override callback
(d) a mix of (b) and (c) - eg. implement an override callback that;
(i) checks if we're win32 "if(strstr(dso->meth->name, "win32"))..."
and if so, convert "blah" into "blah32.dll" (the default is
otherwise to make it "blah.dll").
(ii) default to the normal behaviour - eg. we're not on win32, so
finish with (return dso->meth->dso_name_converter(dso,NULL)).
(e) be retried a number of times by writing a new DSO_METHOD where the
"dso_load()" handler will call the converter repeatedly. Then the
custom converter could use state information in the DSO to suggest
different conversions or paths each time it is invoked.
2000-10-26 17:38:59 +00:00
|
|
|
goto err;
|
2000-04-04 21:57:11 +00:00
|
|
|
}
|
This changes the behaviour of the DSO mechanism for determining an
appropriate filename translation on the host system. Apart from this point,
users should also note that there's a slight change in the API functions
too. The DSO now contains its own to-be-converted filename
("dso->filename"), and at the time the DSO loads the "dso->loaded_filename"
value is set to the translated form. As such, this also provides an impicit
way of determining if the DSO is currently loaded or not. Except, perhaps,
VMS .... :-)
The various DSO_METHODs have been updated for this mechanism except VMS
which is deliberately broken for now, Richard is going to look at how to
fit it in (the source comments in there explain "the issue").
Basically, the new callback scheme allows the filename conversion to
(a) be turned off altogether through the use of the
DSO_FLAG_NO_NAME_TRANSLATION flag,
(b) be handled in the default way using the default DSO_METHOD's converter
(c) overriden per-DSO by setting the override callback
(d) a mix of (b) and (c) - eg. implement an override callback that;
(i) checks if we're win32 "if(strstr(dso->meth->name, "win32"))..."
and if so, convert "blah" into "blah32.dll" (the default is
otherwise to make it "blah.dll").
(ii) default to the normal behaviour - eg. we're not on win32, so
finish with (return dso->meth->dso_name_converter(dso,NULL)).
(e) be retried a number of times by writing a new DSO_METHOD where the
"dso_load()" handler will call the converter repeatedly. Then the
custom converter could use state information in the DSO to suggest
different conversions or paths each time it is invoked.
2000-10-26 17:38:59 +00:00
|
|
|
/* Success */
|
|
|
|
dso->loaded_filename = filename;
|
2000-04-04 21:57:11 +00:00
|
|
|
return(1);
|
This changes the behaviour of the DSO mechanism for determining an
appropriate filename translation on the host system. Apart from this point,
users should also note that there's a slight change in the API functions
too. The DSO now contains its own to-be-converted filename
("dso->filename"), and at the time the DSO loads the "dso->loaded_filename"
value is set to the translated form. As such, this also provides an impicit
way of determining if the DSO is currently loaded or not. Except, perhaps,
VMS .... :-)
The various DSO_METHODs have been updated for this mechanism except VMS
which is deliberately broken for now, Richard is going to look at how to
fit it in (the source comments in there explain "the issue").
Basically, the new callback scheme allows the filename conversion to
(a) be turned off altogether through the use of the
DSO_FLAG_NO_NAME_TRANSLATION flag,
(b) be handled in the default way using the default DSO_METHOD's converter
(c) overriden per-DSO by setting the override callback
(d) a mix of (b) and (c) - eg. implement an override callback that;
(i) checks if we're win32 "if(strstr(dso->meth->name, "win32"))..."
and if so, convert "blah" into "blah32.dll" (the default is
otherwise to make it "blah.dll").
(ii) default to the normal behaviour - eg. we're not on win32, so
finish with (return dso->meth->dso_name_converter(dso,NULL)).
(e) be retried a number of times by writing a new DSO_METHOD where the
"dso_load()" handler will call the converter repeatedly. Then the
custom converter could use state information in the DSO to suggest
different conversions or paths each time it is invoked.
2000-10-26 17:38:59 +00:00
|
|
|
err:
|
|
|
|
/* Cleanup !*/
|
|
|
|
if(filename != NULL)
|
|
|
|
OPENSSL_free(filename);
|
|
|
|
if(p != NULL)
|
|
|
|
OPENSSL_free(p);
|
|
|
|
if(h != NULL)
|
|
|
|
FreeLibrary(h);
|
|
|
|
return(0);
|
2000-04-04 21:57:11 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static int win32_unload(DSO *dso)
|
|
|
|
{
|
|
|
|
HINSTANCE *p;
|
|
|
|
if(dso == NULL)
|
|
|
|
{
|
|
|
|
DSOerr(DSO_F_WIN32_UNLOAD,ERR_R_PASSED_NULL_PARAMETER);
|
|
|
|
return(0);
|
|
|
|
}
|
|
|
|
if(sk_num(dso->meth_data) < 1)
|
2000-04-25 08:37:12 +00:00
|
|
|
return(1);
|
2000-04-04 21:57:11 +00:00
|
|
|
p = (HINSTANCE *)sk_pop(dso->meth_data);
|
|
|
|
if(p == NULL)
|
|
|
|
{
|
|
|
|
DSOerr(DSO_F_WIN32_UNLOAD,DSO_R_NULL_HANDLE);
|
|
|
|
return(0);
|
|
|
|
}
|
2000-06-23 17:29:05 +00:00
|
|
|
if(!FreeLibrary(*p))
|
2000-04-04 21:57:11 +00:00
|
|
|
{
|
|
|
|
DSOerr(DSO_F_WIN32_UNLOAD,DSO_R_UNLOAD_FAILED);
|
|
|
|
/* We should push the value back onto the stack in
|
|
|
|
* case of a retry. */
|
|
|
|
sk_push(dso->meth_data, (char *)p);
|
|
|
|
return(0);
|
|
|
|
}
|
|
|
|
/* Cleanup */
|
2000-06-01 22:19:21 +00:00
|
|
|
OPENSSL_free(p);
|
2000-04-04 21:57:11 +00:00
|
|
|
return(1);
|
|
|
|
}
|
|
|
|
|
2000-06-16 10:45:36 +00:00
|
|
|
/* Using GetProcAddress for variables? TODO: Check this out in
|
|
|
|
* the Win32 API docs, there's probably a variant for variables. */
|
|
|
|
static void *win32_bind_var(DSO *dso, const char *symname)
|
2000-04-04 21:57:11 +00:00
|
|
|
{
|
|
|
|
HINSTANCE *ptr;
|
|
|
|
void *sym;
|
|
|
|
|
2000-06-16 10:45:36 +00:00
|
|
|
if((dso == NULL) || (symname == NULL))
|
2000-04-04 21:57:11 +00:00
|
|
|
{
|
2000-06-16 10:45:36 +00:00
|
|
|
DSOerr(DSO_F_WIN32_BIND_VAR,ERR_R_PASSED_NULL_PARAMETER);
|
|
|
|
return(NULL);
|
2000-04-04 21:57:11 +00:00
|
|
|
}
|
|
|
|
if(sk_num(dso->meth_data) < 1)
|
|
|
|
{
|
2000-06-16 10:45:36 +00:00
|
|
|
DSOerr(DSO_F_WIN32_BIND_VAR,DSO_R_STACK_ERROR);
|
|
|
|
return(NULL);
|
2000-04-04 21:57:11 +00:00
|
|
|
}
|
|
|
|
ptr = (HINSTANCE *)sk_value(dso->meth_data, sk_num(dso->meth_data) - 1);
|
|
|
|
if(ptr == NULL)
|
|
|
|
{
|
2000-06-16 10:45:36 +00:00
|
|
|
DSOerr(DSO_F_WIN32_BIND_VAR,DSO_R_NULL_HANDLE);
|
|
|
|
return(NULL);
|
2000-04-04 21:57:11 +00:00
|
|
|
}
|
|
|
|
sym = GetProcAddress(*ptr, symname);
|
|
|
|
if(sym == NULL)
|
|
|
|
{
|
2000-06-16 10:45:36 +00:00
|
|
|
DSOerr(DSO_F_WIN32_BIND_VAR,DSO_R_SYM_FAILURE);
|
2001-04-25 22:40:55 +00:00
|
|
|
ERR_add_error_data(3, "symname(", symname, ")");
|
2000-06-16 10:45:36 +00:00
|
|
|
return(NULL);
|
2000-04-04 21:57:11 +00:00
|
|
|
}
|
2000-06-16 10:45:36 +00:00
|
|
|
return(sym);
|
|
|
|
}
|
|
|
|
|
|
|
|
static DSO_FUNC_TYPE win32_bind_func(DSO *dso, const char *symname)
|
|
|
|
{
|
|
|
|
HINSTANCE *ptr;
|
|
|
|
void *sym;
|
|
|
|
|
|
|
|
if((dso == NULL) || (symname == NULL))
|
|
|
|
{
|
|
|
|
DSOerr(DSO_F_WIN32_BIND_FUNC,ERR_R_PASSED_NULL_PARAMETER);
|
|
|
|
return(NULL);
|
|
|
|
}
|
|
|
|
if(sk_num(dso->meth_data) < 1)
|
|
|
|
{
|
|
|
|
DSOerr(DSO_F_WIN32_BIND_FUNC,DSO_R_STACK_ERROR);
|
|
|
|
return(NULL);
|
|
|
|
}
|
|
|
|
ptr = (HINSTANCE *)sk_value(dso->meth_data, sk_num(dso->meth_data) - 1);
|
|
|
|
if(ptr == NULL)
|
|
|
|
{
|
|
|
|
DSOerr(DSO_F_WIN32_BIND_FUNC,DSO_R_NULL_HANDLE);
|
|
|
|
return(NULL);
|
|
|
|
}
|
|
|
|
sym = GetProcAddress(*ptr, symname);
|
|
|
|
if(sym == NULL)
|
|
|
|
{
|
|
|
|
DSOerr(DSO_F_WIN32_BIND_FUNC,DSO_R_SYM_FAILURE);
|
2001-04-25 22:40:55 +00:00
|
|
|
ERR_add_error_data(3, "symname(", symname, ")");
|
2000-06-16 10:45:36 +00:00
|
|
|
return(NULL);
|
|
|
|
}
|
|
|
|
return((DSO_FUNC_TYPE)sym);
|
2000-04-04 21:57:11 +00:00
|
|
|
}
|
|
|
|
|
2002-07-15 15:35:40 +00:00
|
|
|
struct file_st
|
|
|
|
{
|
|
|
|
const char *node; int nodelen;
|
|
|
|
const char *device; int devicelen;
|
|
|
|
const char *predir; int predirlen;
|
|
|
|
const char *dir; int dirlen;
|
|
|
|
const char *file; int filelen;
|
2002-10-06 12:14:55 +00:00
|
|
|
};
|
2002-07-15 15:35:40 +00:00
|
|
|
|
|
|
|
static struct file_st *win32_splitter(DSO *dso, const char *filename,
|
|
|
|
int assume_last_is_dir)
|
|
|
|
{
|
|
|
|
struct file_st *result = NULL;
|
|
|
|
enum { IN_NODE, IN_DEVICE, IN_FILE } position;
|
|
|
|
const char *start = filename;
|
2005-11-01 07:49:47 +00:00
|
|
|
char last;
|
2002-07-15 15:35:40 +00:00
|
|
|
|
|
|
|
if (!filename)
|
|
|
|
{
|
2005-05-11 03:45:39 +00:00
|
|
|
DSOerr(DSO_F_WIN32_SPLITTER,DSO_R_NO_FILENAME);
|
2002-10-06 12:14:55 +00:00
|
|
|
/*goto err;*/
|
|
|
|
return(NULL);
|
2002-07-15 15:35:40 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
result = OPENSSL_malloc(sizeof(struct file_st));
|
|
|
|
if(result == NULL)
|
|
|
|
{
|
2005-05-11 03:45:39 +00:00
|
|
|
DSOerr(DSO_F_WIN32_SPLITTER,
|
2002-07-15 15:35:40 +00:00
|
|
|
ERR_R_MALLOC_FAILURE);
|
|
|
|
return(NULL);
|
|
|
|
}
|
|
|
|
|
|
|
|
memset(result, 0, sizeof(struct file_st));
|
|
|
|
position = IN_DEVICE;
|
|
|
|
|
|
|
|
if(filename[0] == '\\' && filename[1] == '\\'
|
|
|
|
|| filename[0] == '/' && filename[1] == '/')
|
|
|
|
{
|
|
|
|
position = IN_NODE;
|
|
|
|
filename += 2;
|
|
|
|
start = filename;
|
|
|
|
result->node = start;
|
|
|
|
}
|
|
|
|
|
|
|
|
do
|
|
|
|
{
|
2005-11-01 07:49:47 +00:00
|
|
|
last = filename[0];
|
|
|
|
switch(last)
|
2002-07-15 15:35:40 +00:00
|
|
|
{
|
|
|
|
case ':':
|
|
|
|
if(position != IN_DEVICE)
|
|
|
|
{
|
2005-05-11 03:45:39 +00:00
|
|
|
DSOerr(DSO_F_WIN32_SPLITTER,
|
2002-07-15 15:35:40 +00:00
|
|
|
DSO_R_INCORRECT_FILE_SYNTAX);
|
2002-10-06 12:14:55 +00:00
|
|
|
/*goto err;*/
|
|
|
|
return(NULL);
|
2002-07-15 15:35:40 +00:00
|
|
|
}
|
|
|
|
result->device = start;
|
|
|
|
result->devicelen = filename - start;
|
|
|
|
position = IN_FILE;
|
|
|
|
start = ++filename;
|
|
|
|
result->dir = start;
|
|
|
|
break;
|
|
|
|
case '\\':
|
|
|
|
case '/':
|
|
|
|
if(position == IN_NODE)
|
|
|
|
{
|
|
|
|
result->nodelen = filename - start;
|
|
|
|
position = IN_FILE;
|
|
|
|
start = ++filename;
|
|
|
|
result->dir = start;
|
|
|
|
}
|
2005-11-01 07:49:47 +00:00
|
|
|
else if(position == IN_DEVICE)
|
|
|
|
{
|
|
|
|
position = IN_FILE;
|
|
|
|
filename++;
|
|
|
|
result->dir = start;
|
|
|
|
result->dirlen = filename - start;
|
|
|
|
start = filename;
|
|
|
|
}
|
2002-07-15 15:35:40 +00:00
|
|
|
else
|
|
|
|
{
|
|
|
|
filename++;
|
|
|
|
result->dirlen += filename - start;
|
2005-11-01 07:49:47 +00:00
|
|
|
start = filename;
|
2002-07-15 15:35:40 +00:00
|
|
|
}
|
|
|
|
break;
|
|
|
|
case '\0':
|
|
|
|
if(position == IN_NODE)
|
|
|
|
{
|
|
|
|
result->nodelen = filename - start;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
if(filename - start > 0)
|
|
|
|
{
|
|
|
|
if (assume_last_is_dir)
|
|
|
|
{
|
2005-11-01 07:49:47 +00:00
|
|
|
if (position == IN_DEVICE)
|
|
|
|
{
|
|
|
|
result->dir = start;
|
|
|
|
result->dirlen = 0;
|
|
|
|
}
|
|
|
|
result->dirlen +=
|
|
|
|
filename - start;
|
2002-07-15 15:35:40 +00:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
result->file = start;
|
2005-11-01 07:49:47 +00:00
|
|
|
result->filelen =
|
|
|
|
filename - start;
|
2002-07-15 15:35:40 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
filename++;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
2005-11-01 07:49:47 +00:00
|
|
|
while(last);
|
2002-07-15 15:35:40 +00:00
|
|
|
|
|
|
|
if(!result->nodelen) result->node = NULL;
|
2002-10-06 12:14:55 +00:00
|
|
|
if(!result->devicelen) result->device = NULL;
|
2002-07-15 15:35:40 +00:00
|
|
|
if(!result->dirlen) result->dir = NULL;
|
|
|
|
if(!result->filelen) result->file = NULL;
|
|
|
|
|
|
|
|
return(result);
|
|
|
|
}
|
|
|
|
|
2002-10-06 12:14:55 +00:00
|
|
|
static char *win32_joiner(DSO *dso, const struct file_st *file_split)
|
2002-07-15 15:35:40 +00:00
|
|
|
{
|
|
|
|
int len = 0, offset = 0;
|
|
|
|
char *result = NULL;
|
|
|
|
const char *start;
|
|
|
|
|
|
|
|
if(!file_split)
|
|
|
|
{
|
2005-05-11 03:45:39 +00:00
|
|
|
DSOerr(DSO_F_WIN32_JOINER,
|
2002-07-15 15:35:40 +00:00
|
|
|
ERR_R_PASSED_NULL_PARAMETER);
|
|
|
|
return(NULL);
|
|
|
|
}
|
|
|
|
if(file_split->node)
|
|
|
|
{
|
|
|
|
len += 2 + file_split->nodelen; /* 2 for starting \\ */
|
|
|
|
if(file_split->predir || file_split->dir || file_split->file)
|
|
|
|
len++; /* 1 for ending \ */
|
|
|
|
}
|
|
|
|
else if(file_split->device)
|
|
|
|
{
|
|
|
|
len += file_split->devicelen + 1; /* 1 for ending : */
|
|
|
|
}
|
|
|
|
len += file_split->predirlen;
|
|
|
|
if(file_split->predir && (file_split->dir || file_split->file))
|
|
|
|
{
|
|
|
|
len++; /* 1 for ending \ */
|
|
|
|
}
|
|
|
|
len += file_split->dirlen;
|
|
|
|
if(file_split->dir && file_split->file)
|
|
|
|
{
|
|
|
|
len++; /* 1 for ending \ */
|
|
|
|
}
|
|
|
|
len += file_split->filelen;
|
|
|
|
|
|
|
|
if(!len)
|
|
|
|
{
|
2005-05-11 03:45:39 +00:00
|
|
|
DSOerr(DSO_F_WIN32_JOINER, DSO_R_EMPTY_FILE_STRUCTURE);
|
2002-07-15 15:35:40 +00:00
|
|
|
return(NULL);
|
|
|
|
}
|
|
|
|
|
|
|
|
result = OPENSSL_malloc(len + 1);
|
|
|
|
if (!result)
|
|
|
|
{
|
2005-05-11 03:45:39 +00:00
|
|
|
DSOerr(DSO_F_WIN32_JOINER,
|
2002-07-15 15:35:40 +00:00
|
|
|
ERR_R_MALLOC_FAILURE);
|
|
|
|
return(NULL);
|
|
|
|
}
|
|
|
|
|
|
|
|
if(file_split->node)
|
|
|
|
{
|
|
|
|
strcpy(&result[offset], "\\\\"); offset += 2;
|
|
|
|
strncpy(&result[offset], file_split->node,
|
|
|
|
file_split->nodelen); offset += file_split->nodelen;
|
|
|
|
if(file_split->predir || file_split->dir || file_split->file)
|
|
|
|
{
|
|
|
|
result[offset] = '\\'; offset++;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else if(file_split->device)
|
|
|
|
{
|
|
|
|
strncpy(&result[offset], file_split->device,
|
|
|
|
file_split->devicelen); offset += file_split->devicelen;
|
|
|
|
result[offset] = ':'; offset++;
|
|
|
|
}
|
|
|
|
start = file_split->predir;
|
|
|
|
while(file_split->predirlen > (start - file_split->predir))
|
|
|
|
{
|
2002-10-06 12:14:55 +00:00
|
|
|
const char *end = openssl_strnchr(start, '/',
|
2002-07-15 15:35:40 +00:00
|
|
|
file_split->predirlen - (start - file_split->predir));
|
|
|
|
if(!end)
|
|
|
|
end = start
|
|
|
|
+ file_split->predirlen
|
|
|
|
- (start - file_split->predir);
|
|
|
|
strncpy(&result[offset], start,
|
|
|
|
end - start); offset += end - start;
|
|
|
|
result[offset] = '\\'; offset++;
|
|
|
|
start = end + 1;
|
|
|
|
}
|
2005-11-01 07:49:47 +00:00
|
|
|
#if 0 /* Not needed, since the directory converter above already appeneded
|
|
|
|
a backslash */
|
2002-07-15 15:35:40 +00:00
|
|
|
if(file_split->predir && (file_split->dir || file_split->file))
|
|
|
|
{
|
|
|
|
result[offset] = '\\'; offset++;
|
|
|
|
}
|
2005-11-01 07:49:47 +00:00
|
|
|
#endif
|
2002-07-15 15:35:40 +00:00
|
|
|
start = file_split->dir;
|
|
|
|
while(file_split->dirlen > (start - file_split->dir))
|
|
|
|
{
|
2002-10-06 12:14:55 +00:00
|
|
|
const char *end = openssl_strnchr(start, '/',
|
2002-07-15 15:35:40 +00:00
|
|
|
file_split->dirlen - (start - file_split->dir));
|
|
|
|
if(!end)
|
|
|
|
end = start
|
|
|
|
+ file_split->dirlen
|
|
|
|
- (start - file_split->dir);
|
|
|
|
strncpy(&result[offset], start,
|
|
|
|
end - start); offset += end - start;
|
|
|
|
result[offset] = '\\'; offset++;
|
|
|
|
start = end + 1;
|
|
|
|
}
|
2005-11-01 07:49:47 +00:00
|
|
|
#if 0 /* Not needed, since the directory converter above already appeneded
|
|
|
|
a backslash */
|
2002-07-15 15:35:40 +00:00
|
|
|
if(file_split->dir && file_split->file)
|
|
|
|
{
|
|
|
|
result[offset] = '\\'; offset++;
|
|
|
|
}
|
2005-11-01 07:49:47 +00:00
|
|
|
#endif
|
2002-07-15 15:35:40 +00:00
|
|
|
strncpy(&result[offset], file_split->file,
|
|
|
|
file_split->filelen); offset += file_split->filelen;
|
|
|
|
result[offset] = '\0';
|
|
|
|
return(result);
|
|
|
|
}
|
|
|
|
|
|
|
|
static char *win32_merger(DSO *dso, const char *filespec1, const char *filespec2)
|
|
|
|
{
|
|
|
|
char *merged = NULL;
|
|
|
|
struct file_st *filespec1_split = NULL;
|
|
|
|
struct file_st *filespec2_split = NULL;
|
|
|
|
|
|
|
|
if(!filespec1 && !filespec2)
|
|
|
|
{
|
|
|
|
DSOerr(DSO_F_WIN32_MERGER,
|
|
|
|
ERR_R_PASSED_NULL_PARAMETER);
|
|
|
|
return(NULL);
|
|
|
|
}
|
|
|
|
if (!filespec2)
|
|
|
|
{
|
|
|
|
merged = OPENSSL_malloc(strlen(filespec1) + 1);
|
|
|
|
if(!merged)
|
|
|
|
{
|
|
|
|
DSOerr(DSO_F_WIN32_MERGER,
|
|
|
|
ERR_R_MALLOC_FAILURE);
|
|
|
|
return(NULL);
|
|
|
|
}
|
|
|
|
strcpy(merged, filespec1);
|
|
|
|
}
|
|
|
|
else if (!filespec1)
|
|
|
|
{
|
|
|
|
merged = OPENSSL_malloc(strlen(filespec2) + 1);
|
|
|
|
if(!merged)
|
|
|
|
{
|
|
|
|
DSOerr(DSO_F_WIN32_MERGER,
|
|
|
|
ERR_R_MALLOC_FAILURE);
|
|
|
|
return(NULL);
|
|
|
|
}
|
|
|
|
strcpy(merged, filespec2);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
2006-01-15 17:28:35 +00:00
|
|
|
filespec1_split = win32_splitter(dso, filespec1, 0);
|
2002-07-15 15:35:40 +00:00
|
|
|
if (!filespec1_split)
|
|
|
|
{
|
|
|
|
DSOerr(DSO_F_WIN32_MERGER,
|
|
|
|
ERR_R_MALLOC_FAILURE);
|
|
|
|
return(NULL);
|
|
|
|
}
|
2006-01-15 17:28:35 +00:00
|
|
|
filespec2_split = win32_splitter(dso, filespec2, 1);
|
2005-11-01 07:49:47 +00:00
|
|
|
if (!filespec2_split)
|
2002-07-15 15:35:40 +00:00
|
|
|
{
|
|
|
|
DSOerr(DSO_F_WIN32_MERGER,
|
|
|
|
ERR_R_MALLOC_FAILURE);
|
|
|
|
OPENSSL_free(filespec1_split);
|
|
|
|
return(NULL);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Fill in into filespec1_split */
|
|
|
|
if (!filespec1_split->node && !filespec1_split->device)
|
|
|
|
{
|
|
|
|
filespec1_split->node = filespec2_split->node;
|
|
|
|
filespec1_split->nodelen = filespec2_split->nodelen;
|
|
|
|
filespec1_split->device = filespec2_split->device;
|
|
|
|
filespec1_split->devicelen = filespec2_split->devicelen;
|
|
|
|
}
|
|
|
|
if (!filespec1_split->dir)
|
|
|
|
{
|
|
|
|
filespec1_split->dir = filespec2_split->dir;
|
|
|
|
filespec1_split->dirlen = filespec2_split->dirlen;
|
|
|
|
}
|
|
|
|
else if (filespec1_split->dir[0] != '\\'
|
|
|
|
&& filespec1_split->dir[0] != '/')
|
|
|
|
{
|
|
|
|
filespec1_split->predir = filespec2_split->dir;
|
|
|
|
filespec1_split->predirlen = filespec2_split->dirlen;
|
|
|
|
}
|
|
|
|
if (!filespec1_split->file)
|
|
|
|
{
|
|
|
|
filespec1_split->file = filespec2_split->file;
|
|
|
|
filespec1_split->filelen = filespec2_split->filelen;
|
|
|
|
}
|
|
|
|
|
|
|
|
merged = win32_joiner(dso, filespec1_split);
|
|
|
|
}
|
|
|
|
return(merged);
|
|
|
|
}
|
|
|
|
|
This changes the behaviour of the DSO mechanism for determining an
appropriate filename translation on the host system. Apart from this point,
users should also note that there's a slight change in the API functions
too. The DSO now contains its own to-be-converted filename
("dso->filename"), and at the time the DSO loads the "dso->loaded_filename"
value is set to the translated form. As such, this also provides an impicit
way of determining if the DSO is currently loaded or not. Except, perhaps,
VMS .... :-)
The various DSO_METHODs have been updated for this mechanism except VMS
which is deliberately broken for now, Richard is going to look at how to
fit it in (the source comments in there explain "the issue").
Basically, the new callback scheme allows the filename conversion to
(a) be turned off altogether through the use of the
DSO_FLAG_NO_NAME_TRANSLATION flag,
(b) be handled in the default way using the default DSO_METHOD's converter
(c) overriden per-DSO by setting the override callback
(d) a mix of (b) and (c) - eg. implement an override callback that;
(i) checks if we're win32 "if(strstr(dso->meth->name, "win32"))..."
and if so, convert "blah" into "blah32.dll" (the default is
otherwise to make it "blah.dll").
(ii) default to the normal behaviour - eg. we're not on win32, so
finish with (return dso->meth->dso_name_converter(dso,NULL)).
(e) be retried a number of times by writing a new DSO_METHOD where the
"dso_load()" handler will call the converter repeatedly. Then the
custom converter could use state information in the DSO to suggest
different conversions or paths each time it is invoked.
2000-10-26 17:38:59 +00:00
|
|
|
static char *win32_name_converter(DSO *dso, const char *filename)
|
|
|
|
{
|
|
|
|
char *translated;
|
|
|
|
int len, transform;
|
|
|
|
|
|
|
|
len = strlen(filename);
|
|
|
|
transform = ((strstr(filename, "/") == NULL) &&
|
|
|
|
(strstr(filename, "\\") == NULL) &&
|
|
|
|
(strstr(filename, ":") == NULL));
|
|
|
|
if(transform)
|
|
|
|
/* We will convert this to "%s.dll" */
|
|
|
|
translated = OPENSSL_malloc(len + 5);
|
|
|
|
else
|
|
|
|
/* We will simply duplicate filename */
|
|
|
|
translated = OPENSSL_malloc(len + 1);
|
|
|
|
if(translated == NULL)
|
|
|
|
{
|
|
|
|
DSOerr(DSO_F_WIN32_NAME_CONVERTER,
|
|
|
|
DSO_R_NAME_TRANSLATION_FAILED);
|
|
|
|
return(NULL);
|
|
|
|
}
|
|
|
|
if(transform)
|
|
|
|
sprintf(translated, "%s.dll", filename);
|
|
|
|
else
|
|
|
|
sprintf(translated, "%s", filename);
|
|
|
|
return(translated);
|
|
|
|
}
|
|
|
|
|
2002-10-06 12:14:55 +00:00
|
|
|
static const char *openssl_strnchr(const char *string, int c, size_t len)
|
|
|
|
{
|
|
|
|
size_t i;
|
|
|
|
const char *p;
|
|
|
|
for (i = 0, p = string; i < len && *p; i++, p++)
|
|
|
|
{
|
|
|
|
if (*p == c)
|
|
|
|
return p;
|
|
|
|
}
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2001-02-20 08:13:47 +00:00
|
|
|
#endif /* OPENSSL_SYS_WIN32 */
|