зеркало из https://github.com/mozilla/pjs.git
Fix for bug 115951 . Unload freebl dynamic library . Also fix tiny one-time leak of library name . r=nelson,wtchang
This commit is contained in:
julien.pierre.bugs%sun.com
Родитель
213a0a451c
Коммит
1f77032405
|
|
@ -37,7 +37,7 @@
|
|||
* the terms of any one of the MPL, the GPL or the LGPL.
|
||||
*
|
||||
* ***** END LICENSE BLOCK ***** */
|
||||
/* $Id: loader.c,v 1.29 2006-06-26 23:42:58 wtchang%redhat.com Exp $ */
|
||||
/* $Id: loader.c,v 1.30 2006-09-28 00:40:55 julien.pierre.bugs%sun.com Exp $ */
|
||||
|
||||
#include "loader.h"
|
||||
#include "prmem.h"
|
||||
|
|
@ -187,9 +187,7 @@ static char* bl_GetOriginalPathname(const char* link)
|
|||
|
||||
const char* softoken=SHLIB_PREFIX"softokn"SOFTOKEN_SHLIB_VERSION"."SHLIB_SUFFIX;
|
||||
|
||||
typedef struct {
|
||||
PRLibrary *dlh;
|
||||
} BLLibrary;
|
||||
static PRLibrary* blLib;
|
||||
|
||||
/*
|
||||
* Load the freebl library with the file name 'name' residing in the same
|
||||
|
|
@ -224,20 +222,14 @@ bl_LoadFreeblLibInSoftokenDir(const char *softokenPath, const char *name)
|
|||
return dlh;
|
||||
}
|
||||
|
||||
static BLLibrary *
|
||||
static PRLibrary *
|
||||
bl_LoadLibrary(const char *name)
|
||||
{
|
||||
BLLibrary *lib = NULL;
|
||||
PRLibrary *lib = NULL;
|
||||
PRFuncPtr fn_addr;
|
||||
char* softokenPath = NULL;
|
||||
PRLibSpec libSpec;
|
||||
|
||||
lib = PR_NEWZAP(BLLibrary);
|
||||
if (NULL == lib) {
|
||||
PR_SetError(PR_OUT_OF_MEMORY_ERROR, 0);
|
||||
return NULL;
|
||||
}
|
||||
|
||||
/* Get the pathname for the loaded libsoftokn, i.e. /usr/lib/libsoftokn3.so
|
||||
* PR_GetLibraryFilePathname works with either the base library name or a
|
||||
* function pointer, depending on the platform. We can't query an exported
|
||||
|
|
@ -249,9 +241,9 @@ bl_LoadLibrary(const char *name)
|
|||
softokenPath = PR_GetLibraryFilePathname(softoken, fn_addr);
|
||||
|
||||
if (softokenPath) {
|
||||
lib->dlh = bl_LoadFreeblLibInSoftokenDir(softokenPath, name);
|
||||
lib = bl_LoadFreeblLibInSoftokenDir(softokenPath, name);
|
||||
#ifdef XP_UNIX
|
||||
if (!lib->dlh) {
|
||||
if (!lib) {
|
||||
/*
|
||||
* If softokenPath is a symbolic link, resolve the symbolic
|
||||
* link and try again.
|
||||
|
|
@ -260,49 +252,28 @@ bl_LoadLibrary(const char *name)
|
|||
if (originalSoftokenPath) {
|
||||
PR_Free(softokenPath);
|
||||
softokenPath = originalSoftokenPath;
|
||||
lib->dlh = bl_LoadFreeblLibInSoftokenDir(softokenPath, name);
|
||||
lib = bl_LoadFreeblLibInSoftokenDir(softokenPath, name);
|
||||
}
|
||||
}
|
||||
#endif
|
||||
PR_Free(softokenPath);
|
||||
}
|
||||
if (!lib->dlh) {
|
||||
if (!lib) {
|
||||
#ifdef DEBUG_LOADER
|
||||
PR_fprintf(PR_STDOUT, "\nAttempting to load %s\n", name);
|
||||
#endif
|
||||
libSpec.type = PR_LibSpec_Pathname;
|
||||
libSpec.value.pathname = name;
|
||||
lib->dlh = PR_LoadLibraryWithFlags(libSpec, PR_LD_NOW | PR_LD_LOCAL);
|
||||
lib = PR_LoadLibraryWithFlags(libSpec, PR_LD_NOW | PR_LD_LOCAL);
|
||||
}
|
||||
if (NULL == lib->dlh) {
|
||||
if (NULL == lib) {
|
||||
#ifdef DEBUG_LOADER
|
||||
PR_fprintf(PR_STDOUT, "\nLoading failed : %s.\n", name);
|
||||
#endif
|
||||
PR_Free(lib);
|
||||
lib = NULL;
|
||||
}
|
||||
return lib;
|
||||
}
|
||||
|
||||
static PRFuncPtr
|
||||
bl_FindSymbol(BLLibrary *lib, const char *name)
|
||||
{
|
||||
PRFuncPtr f;
|
||||
|
||||
f = PR_FindFunctionSymbol(lib->dlh, name);
|
||||
return f;
|
||||
}
|
||||
|
||||
static PRStatus
|
||||
bl_UnloadLibrary(BLLibrary *lib)
|
||||
{
|
||||
if (PR_SUCCESS != PR_UnloadLibrary(lib->dlh)) {
|
||||
return PR_FAILURE;
|
||||
}
|
||||
PR_Free(lib);
|
||||
return PR_SUCCESS;
|
||||
}
|
||||
|
||||
#define LSB(x) ((x)&0xff)
|
||||
#define MSB(x) ((x)>>8)
|
||||
|
||||
|
|
@ -314,7 +285,7 @@ static const char *libraryName = NULL;
|
|||
static PRStatus
|
||||
freebl_LoadDSO( void )
|
||||
{
|
||||
BLLibrary * handle;
|
||||
PRLibrary * handle;
|
||||
const char * name = getLibName();
|
||||
|
||||
if (!name) {
|
||||
|
|
@ -324,7 +295,8 @@ freebl_LoadDSO( void )
|
|||
|
||||
handle = bl_LoadLibrary(name);
|
||||
if (handle) {
|
||||
PRFuncPtr address = bl_FindSymbol(handle, "FREEBL_GetVector");
|
||||
PRFuncPtr address = PR_FindFunctionSymbol(handle, "FREEBL_GetVector");
|
||||
PRStatus status;
|
||||
if (address) {
|
||||
FREEBLGetVectorFn * getVector = (FREEBLGetVectorFn *)address;
|
||||
const FREEBLVector * dsoVector = getVector();
|
||||
|
|
@ -336,22 +308,26 @@ freebl_LoadDSO( void )
|
|||
dsoVector->length >= sizeof(FREEBLVector)) {
|
||||
vector = dsoVector;
|
||||
libraryName = name;
|
||||
blLib = handle;
|
||||
return PR_SUCCESS;
|
||||
}
|
||||
}
|
||||
}
|
||||
bl_UnloadLibrary(handle);
|
||||
status = PR_UnloadLibrary(handle);
|
||||
PORT_Assert(PR_SUCCESS == status);
|
||||
}
|
||||
return PR_FAILURE;
|
||||
}
|
||||
|
||||
static const PRCallOnceType pristineCallOnce;
|
||||
static PRCallOnceType loadFreeBLOnce;
|
||||
|
||||
static PRStatus
|
||||
freebl_RunLoaderOnce( void )
|
||||
{
|
||||
PRStatus status;
|
||||
static PRCallOnceType once;
|
||||
|
||||
status = PR_CallOnce(&once, &freebl_LoadDSO);
|
||||
status = PR_CallOnce(&loadFreeBLOnce, &freebl_LoadDSO);
|
||||
return status;
|
||||
}
|
||||
|
||||
|
|
@ -1002,6 +978,14 @@ BL_Cleanup(void)
|
|||
if (!vector && PR_SUCCESS != freebl_RunLoaderOnce())
|
||||
return;
|
||||
(vector->p_BL_Cleanup)();
|
||||
vector = NULL;
|
||||
PORT_Assert(blLib);
|
||||
if (blLib) {
|
||||
PRStatus status = PR_UnloadLibrary(blLib);
|
||||
PORT_Assert(PR_SUCCESS == status);
|
||||
blLib = NULL;
|
||||
}
|
||||
loadFreeBLOnce = pristineCallOnce;
|
||||
}
|
||||
|
||||
/* ============== New for 3.003 =============================== */
|
||||
|
|
|
|||
|
|
@ -40,7 +40,7 @@
|
|||
* the terms of any one of the MPL, the GPL or the LGPL.
|
||||
*
|
||||
* ***** END LICENSE BLOCK ***** */
|
||||
/* $Id: sslsock.c,v 1.48 2006-05-18 01:10:21 nelson%bolyard.com Exp $ */
|
||||
/* $Id: sslsock.c,v 1.49 2006-09-28 00:40:55 julien.pierre.bugs%sun.com Exp $ */
|
||||
#include "seccomon.h"
|
||||
#include "cert.h"
|
||||
#include "keyhi.h"
|
||||
|
|
@ -49,6 +49,8 @@
|
|||
#include "sslproto.h"
|
||||
#include "nspr.h"
|
||||
#include "private/pprio.h"
|
||||
#include "blapi.h"
|
||||
#include "nss.h"
|
||||
|
||||
#define SET_ERROR_CODE /* reminder */
|
||||
|
||||
|
|
@ -501,6 +503,28 @@ SSL_Enable(PRFileDesc *fd, int which, PRBool on)
|
|||
return SSL_OptionSet(fd, which, on);
|
||||
}
|
||||
|
||||
static const PRCallOnceType pristineCallOnce;
|
||||
static PRCallOnceType setupBypassOnce;
|
||||
|
||||
static SECStatus SSL_BypassShutdown(void* appData, void* nssData)
|
||||
{
|
||||
BL_Cleanup();
|
||||
setupBypassOnce = pristineCallOnce;
|
||||
return SECSuccess;
|
||||
}
|
||||
|
||||
static PRStatus SSL_BypassRegisterShutdown(void)
|
||||
{
|
||||
SECStatus rv = NSS_RegisterShutdown(SSL_BypassShutdown, NULL);
|
||||
PORT_Assert(SECSuccess == rv);
|
||||
return SECSuccess == rv ? PR_SUCCESS : PR_FAILURE;
|
||||
}
|
||||
|
||||
static PRStatus SSL_BypassSetup(void)
|
||||
{
|
||||
return PR_CallOnce(&setupBypassOnce, &SSL_BypassRegisterShutdown);
|
||||
}
|
||||
|
||||
SECStatus
|
||||
SSL_OptionSet(PRFileDesc *fd, PRInt32 which, PRBool on)
|
||||
{
|
||||
|
|
@ -625,7 +649,15 @@ SSL_OptionSet(PRFileDesc *fd, PRInt32 which, PRBool on)
|
|||
PORT_SetError(PR_INVALID_STATE_ERROR);
|
||||
rv = SECFailure;
|
||||
} else {
|
||||
ss->opt.bypassPKCS11 = on;
|
||||
if (PR_FALSE != on) {
|
||||
if (PR_SUCCESS == SSL_BypassSetup() ) {
|
||||
ss->opt.bypassPKCS11 = on;
|
||||
} else {
|
||||
rv = SECFailure;
|
||||
}
|
||||
} else {
|
||||
ss->opt.bypassPKCS11 = PR_FALSE;
|
||||
}
|
||||
}
|
||||
break;
|
||||
|
||||
|
|
@ -846,7 +878,15 @@ SSL_OptionSetDefault(PRInt32 which, PRBool on)
|
|||
break;
|
||||
|
||||
case SSL_BYPASS_PKCS11:
|
||||
ssl_defaults.bypassPKCS11 = on;
|
||||
if (PR_FALSE != on) {
|
||||
if (PR_SUCCESS == SSL_BypassSetup()) {
|
||||
ssl_defaults.bypassPKCS11 = on;
|
||||
} else {
|
||||
return SECFailure;
|
||||
}
|
||||
} else {
|
||||
ssl_defaults.bypassPKCS11 = PR_FALSE;
|
||||
}
|
||||
break;
|
||||
|
||||
case SSL_NO_LOCKS:
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче