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

Side by Side Diff: nss/mozilla/security/nss/lib/pk11wrap/pk11pub.h

Issue 3135002: Update to NSS 3.12.7 and NSPR 4.8.6.... (Closed) Base URL: svn://chrome-svn/chrome/trunk/deps/third_party/
Patch Set: Created 10 years, 4 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 | Annotate | Revision Log
OLDNEW
1 /* ***** BEGIN LICENSE BLOCK ***** 1 /* ***** BEGIN LICENSE BLOCK *****
2 * Version: MPL 1.1/GPL 2.0/LGPL 2.1 2 * Version: MPL 1.1/GPL 2.0/LGPL 2.1
3 * 3 *
4 * The contents of this file are subject to the Mozilla Public License Version 4 * The contents of this file are subject to the Mozilla Public License Version
5 * 1.1 (the "License"); you may not use this file except in compliance with 5 * 1.1 (the "License"); you may not use this file except in compliance with
6 * the License. You may obtain a copy of the License at 6 * the License. You may obtain a copy of the License at
7 * http://www.mozilla.org/MPL/ 7 * http://www.mozilla.org/MPL/
8 * 8 *
9 * Software distributed under the License is distributed on an "AS IS" basis, 9 * Software distributed under the License is distributed on an "AS IS" basis,
10 * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License 10 * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
(...skipping 196 matching lines...) Expand 10 before | Expand all | Expand 10 after
207 * configDir - The location of the databases for this token. If configDir is 207 * configDir - The location of the databases for this token. If configDir is
208 * not specified, and noCertDB and noKeyDB is not specified, the load 208 * not specified, and noCertDB and noKeyDB is not specified, the load
209 * will fail. 209 * will fail.
210 * certPrefix - Cert prefix for this token. 210 * certPrefix - Cert prefix for this token.
211 * keyPrefix - Prefix for the key database for this token. (if not specified, 211 * keyPrefix - Prefix for the key database for this token. (if not specified,
212 * certPrefix will be used). 212 * certPrefix will be used).
213 * tokenDescription - The label value for this token returned in the 213 * tokenDescription - The label value for this token returned in the
214 * CK_TOKEN_INFO structure with an internationalize string (UTF8). 214 * CK_TOKEN_INFO structure with an internationalize string (UTF8).
215 * This value will be truncated at 32 bytes (no NULL, partial UTF8 215 * This value will be truncated at 32 bytes (no NULL, partial UTF8
216 * characters dropped). You should specify a user friendly name here 216 * characters dropped). You should specify a user friendly name here
217 * as this is the value the token will be refered to in most 217 * as this is the value the token will be referred to in most
218 * application UI's. You should make sure tokenDescription is unique. 218 * application UI's. You should make sure tokenDescription is unique.
219 * slotDescription - The slotDescription value for this token returned 219 * slotDescription - The slotDescription value for this token returned
220 * in the CK_SLOT_INFO structure with an internationalize string 220 * in the CK_SLOT_INFO structure with an internationalize string
221 * (UTF8). This value will be truncated at 64 bytes (no NULL, partial 221 * (UTF8). This value will be truncated at 64 bytes (no NULL, partial
222 * UTF8 characters dropped). This name will not change after the 222 * UTF8 characters dropped). This name will not change after the
223 * database is closed. It should have some number to make this unique. 223 * database is closed. It should have some number to make this unique.
224 * minPWLen - minimum password length for this token. 224 * minPWLen - minimum password length for this token.
225 * flags - comma separated list of flag values, parsed case-insensitive. 225 * flags - comma separated list of flag values, parsed case-insensitive.
226 * Valid flags are: 226 * Valid flags are:
227 * readOnly - Databases should be opened read only. 227 * readOnly - Databases should be opened read only.
(...skipping 593 matching lines...) Expand 10 before | Expand all | Expand 10 after
821 PK11_GetLowLevelKeyIDForCert(PK11SlotInfo *slot, 821 PK11_GetLowLevelKeyIDForCert(PK11SlotInfo *slot,
822 CERTCertificate *cert, void *pwarg); 822 CERTCertificate *cert, void *pwarg);
823 SECItem * 823 SECItem *
824 PK11_GetLowLevelKeyIDForPrivateKey(SECKEYPrivateKey *key); 824 PK11_GetLowLevelKeyIDForPrivateKey(SECKEYPrivateKey *key);
825 825
826 PRBool SECMOD_HasRootCerts(void); 826 PRBool SECMOD_HasRootCerts(void);
827 827
828 SEC_END_PROTOS 828 SEC_END_PROTOS
829 829
830 #endif 830 #endif
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698