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

Side by Side Diff: nss/lib/util/utilpars.h

Issue 1504923011: Update NSS to 3.21 RTM and NSPR to 4.11 RTM (Closed) Base URL: http://src.chromium.org/svn/trunk/deps/third_party/nss
Patch Set: Created 5 years 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 | Annotate | Revision Log
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 #ifndef _UTILPARS_H_ 5 #ifndef _UTILPARS_H_
6 #define _UTILPARS_H_ 1 6 #define _UTILPARS_H_ 1
7 7
8 #include "utilparst.h" 8 #include "utilparst.h"
9 #include "plarena.h" 9 #include "plarena.h"
10 10
(...skipping 21 matching lines...) Expand all
32 char *NSSUTIL_DoubleEscape(const char *string, char quote1, char quote2); 32 char *NSSUTIL_DoubleEscape(const char *string, char quote1, char quote2);
33 33
34 unsigned long NSSUTIL_ArgParseSlotFlags(char *label,char *params); 34 unsigned long NSSUTIL_ArgParseSlotFlags(char *label,char *params);
35 struct NSSUTILPreSlotInfoStr *NSSUTIL_ArgParseSlotInfo(PLArenaPool *arena, 35 struct NSSUTILPreSlotInfoStr *NSSUTIL_ArgParseSlotInfo(PLArenaPool *arena,
36 char *slotParams, int *retCount); 36 char *slotParams, int *retCount);
37 char * NSSUTIL_MkSlotString(unsigned long slotID, unsigned long defaultFlags, 37 char * NSSUTIL_MkSlotString(unsigned long slotID, unsigned long defaultFlags,
38 unsigned long timeout, unsigned char askpw_in, 38 unsigned long timeout, unsigned char askpw_in,
39 PRBool hasRootCerts, PRBool hasRootTrust); 39 PRBool hasRootCerts, PRBool hasRootTrust);
40 SECStatus NSSUTIL_ArgParseModuleSpec(char *modulespec, char **lib, char **mod, 40 SECStatus NSSUTIL_ArgParseModuleSpec(char *modulespec, char **lib, char **mod,
41 char **parameters, char **nss); 41 char **parameters, char **nss);
42 SECStatus NSSUTIL_ArgParseModuleSpecEx(char *modulespec, char **lib, char **mod,
43 char **parameters, char **nss, char **co nfig);
42 char *NSSUTIL_MkModuleSpec(char *dllName, char *commonName, 44 char *NSSUTIL_MkModuleSpec(char *dllName, char *commonName,
43 char *parameters, char *NSS); 45 char *parameters, char *NSS);
46 char *NSSUTIL_MkModuleSpecEx(char *dllName, char *commonName,
47 char *parameters, char *NSS, char *config);
44 void NSSUTIL_ArgParseCipherFlags(unsigned long *newCiphers,char *cipherList); 48 void NSSUTIL_ArgParseCipherFlags(unsigned long *newCiphers,char *cipherList);
45 char * NSSUTIL_MkNSSString(char **slotStrings, int slotCount, PRBool internal, 49 char * NSSUTIL_MkNSSString(char **slotStrings, int slotCount, PRBool internal,
46 PRBool isFIPS, PRBool isModuleDB, PRBool isModuleDBOnly, 50 PRBool isFIPS, PRBool isModuleDB, PRBool isModuleDBOnly,
47 PRBool isCritical, unsigned long trustOrder, 51 PRBool isCritical, unsigned long trustOrder,
48 unsigned long cipherOrder, unsigned long ssl0, unsigned long ssl1); 52 unsigned long cipherOrder, unsigned long ssl0, unsigned long ssl1);
49 53
50 /* 54 /*
51 * private functions for softoken. 55 * private functions for softoken.
52 */ 56 */
53 char * _NSSUTIL_GetSecmodName(char *param, NSSDBType *dbType, char **appName, ch ar **filename,PRBool *rw); 57 char * _NSSUTIL_GetSecmodName(char *param, NSSDBType *dbType, char **appName, ch ar **filename,PRBool *rw);
54 const char *_NSSUTIL_EvaluateConfigDir(const char *configdir, NSSDBType *dbType, char **app); 58 const char *_NSSUTIL_EvaluateConfigDir(const char *configdir, NSSDBType *dbType, char **app);
55 59
56 #endif /* _UTILPARS_H_ */ 60 #endif /* _UTILPARS_H_ */
OLDNEW
« nss/lib/util/pkcs11n.h ('K') | « nss/lib/util/utilmod.c ('k') | nss/lib/util/utilpars.c » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698