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

Unified Diff: mozilla/security/nss/lib/nss/nssinit.c

Issue 10961060: Update NSS to NSS 3.14 Beta 1. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/deps/third_party/nss/
Patch Set: Add the NSS snapshot timestamp to README.chromium and nss-checkout.sh Created 8 years, 3 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « mozilla/security/nss/lib/nss/nss.h ('k') | mozilla/security/nss/lib/pk11wrap/pk11auth.c » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mozilla/security/nss/lib/nss/nssinit.c
===================================================================
--- mozilla/security/nss/lib/nss/nssinit.c (revision 158129)
+++ mozilla/security/nss/lib/nss/nssinit.c (working copy)
@@ -34,6 +34,7 @@
#include "secmodi.h"
#include "ocspti.h"
#include "ocspi.h"
+#include "utilpars.h"
/*
* On Windows nss3.dll needs to export the symbol 'mktemp' to be
@@ -375,39 +376,39 @@
* configdir is double nested, and Windows uses the same character
* for file seps as we use for escapes! (sigh).
*/
- lconfigdir = secmod_DoubleEscape(configdir, '\'', '\"');
+ lconfigdir = NSSUTIL_DoubleEscape(configdir, '\'', '\"');
if (lconfigdir == NULL) {
goto loser;
}
- lcertPrefix = secmod_DoubleEscape(certPrefix, '\'', '\"');
+ lcertPrefix = NSSUTIL_DoubleEscape(certPrefix, '\'', '\"');
if (lcertPrefix == NULL) {
goto loser;
}
- lkeyPrefix = secmod_DoubleEscape(keyPrefix, '\'', '\"');
+ lkeyPrefix = NSSUTIL_DoubleEscape(keyPrefix, '\'', '\"');
if (lkeyPrefix == NULL) {
goto loser;
}
- lsecmodName = secmod_DoubleEscape(secmodName, '\'', '\"');
+ lsecmodName = NSSUTIL_DoubleEscape(secmodName, '\'', '\"');
if (lsecmodName == NULL) {
goto loser;
}
- lupdateDir = secmod_DoubleEscape(updateDir, '\'', '\"');
+ lupdateDir = NSSUTIL_DoubleEscape(updateDir, '\'', '\"');
if (lupdateDir == NULL) {
goto loser;
}
- lupdCertPrefix = secmod_DoubleEscape(updCertPrefix, '\'', '\"');
+ lupdCertPrefix = NSSUTIL_DoubleEscape(updCertPrefix, '\'', '\"');
if (lupdCertPrefix == NULL) {
goto loser;
}
- lupdKeyPrefix = secmod_DoubleEscape(updKeyPrefix, '\'', '\"');
+ lupdKeyPrefix = NSSUTIL_DoubleEscape(updKeyPrefix, '\'', '\"');
if (lupdKeyPrefix == NULL) {
goto loser;
}
- lupdateID = secmod_DoubleEscape(updateID, '\'', '\"');
+ lupdateID = NSSUTIL_DoubleEscape(updateID, '\'', '\"');
if (lupdateID == NULL) {
goto loser;
}
- lupdateName = secmod_DoubleEscape(updateName, '\'', '\"');
+ lupdateName = NSSUTIL_DoubleEscape(updateName, '\'', '\"');
if (lupdateName == NULL) {
goto loser;
}
@@ -724,6 +725,10 @@
PZ_NotifyAllCondVar(nssInitCondition);
PZ_Unlock(nssInitLock);
+ if (initContextPtr && configStrings) {
+ PR_smprintf_free(configStrings);
+ }
+
return SECSuccess;
loser:
@@ -1270,10 +1275,6 @@
vpatch == NSS_VPATCH && vbuild > NSS_VBUILD) {
return PR_FALSE;
}
- /* Check dependent libraries */
- if (PR_VersionCheck(PR_VERSION) == PR_FALSE) {
- return PR_FALSE;
- }
return PR_TRUE;
}
« no previous file with comments | « mozilla/security/nss/lib/nss/nss.h ('k') | mozilla/security/nss/lib/pk11wrap/pk11auth.c » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698