| Index: nss/lib/pk11wrap/pk11load.c
|
| diff --git a/nss/lib/pk11wrap/pk11load.c b/nss/lib/pk11wrap/pk11load.c
|
| index bf7cc68dae2b9c23e24ac973114ba086037887d5..bfc488630c2c946683799a9176f4b9ceb30b7cb6 100644
|
| --- a/nss/lib/pk11wrap/pk11load.c
|
| +++ b/nss/lib/pk11wrap/pk11load.c
|
| @@ -498,7 +498,7 @@ library_loaded:
|
|
|
| #ifdef DEBUG_MODULE
|
| if (PR_TRUE) {
|
| - modToDBG = PR_GetEnv("NSS_DEBUG_PKCS11_MODULE");
|
| + modToDBG = PR_GetEnvSecure("NSS_DEBUG_PKCS11_MODULE");
|
| if (modToDBG && strcmp(mod->commonName, modToDBG) == 0) {
|
| mod->functionList = (void *)nss_InsertDeviceLog(
|
| (CK_FUNCTION_LIST_PTR)mod->functionList);
|
| @@ -590,7 +590,7 @@ fail2:
|
| }
|
| fail:
|
| mod->functionList = NULL;
|
| - disableUnload = PR_GetEnv("NSS_DISABLE_UNLOAD");
|
| + disableUnload = PR_GetEnvSecure("NSS_DISABLE_UNLOAD");
|
| if (library && !disableUnload) {
|
| PR_UnloadLibrary(library);
|
| }
|
| @@ -620,7 +620,7 @@ SECMOD_UnloadModule(SECMODModule *mod) {
|
| #ifndef NSS_STATIC
|
| if (0 == PR_ATOMIC_DECREMENT(&softokenLoadCount)) {
|
| if (softokenLib) {
|
| - disableUnload = PR_GetEnv("NSS_DISABLE_UNLOAD");
|
| + disableUnload = PR_GetEnvSecure("NSS_DISABLE_UNLOAD");
|
| if (!disableUnload) {
|
| #ifdef DEBUG
|
| PRStatus status = PR_UnloadLibrary(softokenLib);
|
| @@ -648,7 +648,7 @@ SECMOD_UnloadModule(SECMODModule *mod) {
|
| return SECFailure;
|
| }
|
|
|
| - disableUnload = PR_GetEnv("NSS_DISABLE_UNLOAD");
|
| + disableUnload = PR_GetEnvSecure("NSS_DISABLE_UNLOAD");
|
| if (!disableUnload) {
|
| PR_UnloadLibrary(library);
|
| }
|
|
|