Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(369)

Side by Side Diff: nss/lib/softoken/lgglue.c

Issue 1843333003: Update NSPR to 4.12 and NSS to 3.23 on iOS (Closed) Base URL: https://chromium.googlesource.com/chromium/deps/nss.git@master
Patch Set: Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 /* This Source Code Form is subject to the terms of the Mozilla Public 1 /* This Source Code Form is subject to the terms of the Mozilla Public
2 * License, v. 2.0. If a copy of the MPL was not distributed with this 2 * License, v. 2.0. If a copy of the MPL was not distributed with this
3 * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ 3 * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
4 /* 4 /*
5 * The following code handles the storage of PKCS 11 modules used by the 5 * The following code handles the storage of PKCS 11 modules used by the
6 * NSS. This file is written to abstract away how the modules are 6 * NSS. This file is written to abstract away how the modules are
7 * stored so we can deside that later. 7 * stored so we can deside that later.
8 */ 8 */
9 #include "sftkdb.h" 9 #include "sftkdb.h"
10 #include "sftkdbti.h" 10 #include "sftkdbti.h"
(...skipping 421 matching lines...) Expand 10 before | Expand all | Expand 10 after
432 if (!legacy_glue_lib) { 432 if (!legacy_glue_lib) {
433 return CKR_OK; 433 return CKR_OK;
434 } 434 }
435 if (legacy_glue_shutdown) { 435 if (legacy_glue_shutdown) {
436 #ifdef NO_FORK_CHECK 436 #ifdef NO_FORK_CHECK
437 PRBool parentForkedAfterC_Initialize = PR_FALSE; 437 PRBool parentForkedAfterC_Initialize = PR_FALSE;
438 #endif 438 #endif
439 crv = (*legacy_glue_shutdown)(parentForkedAfterC_Initialize); 439 crv = (*legacy_glue_shutdown)(parentForkedAfterC_Initialize);
440 } 440 }
441 #ifndef NSS_STATIC 441 #ifndef NSS_STATIC
442 disableUnload = PR_GetEnv("NSS_DISABLE_UNLOAD"); 442 disableUnload = PR_GetEnvSecure("NSS_DISABLE_UNLOAD");
443 if (!disableUnload) { 443 if (!disableUnload) {
444 PR_UnloadLibrary(legacy_glue_lib); 444 PR_UnloadLibrary(legacy_glue_lib);
445 } 445 }
446 #endif 446 #endif
447 legacy_glue_lib = NULL; 447 legacy_glue_lib = NULL;
448 legacy_glue_open = NULL; 448 legacy_glue_open = NULL;
449 legacy_glue_readSecmod = NULL; 449 legacy_glue_readSecmod = NULL;
450 legacy_glue_releaseSecmod = NULL; 450 legacy_glue_releaseSecmod = NULL;
451 legacy_glue_deleteSecmod = NULL; 451 legacy_glue_deleteSecmod = NULL;
452 legacy_glue_addSecmod = NULL; 452 legacy_glue_addSecmod = NULL;
453 legacy_glue_libCheckFailed = PR_FALSE; 453 legacy_glue_libCheckFailed = PR_FALSE;
454 legacy_glue_libCheckSucceeded = PR_FALSE; 454 legacy_glue_libCheckSucceeded = PR_FALSE;
455 return crv; 455 return crv;
456 } 456 }
457 457
458 458
OLDNEW
« no previous file with comments | « nss/lib/softoken/fipstokn.c ('k') | nss/lib/softoken/lowkey.c » ('j') | nss/lib/util/secoid.c » ('J')

Powered by Google App Engine
This is Rietveld 408576698