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

Side by Side Diff: nss/lib/pk11wrap/secmodt.h

Issue 319593003: Update to NSS 3.16.2 Beta 3. (Closed) Base URL: http://src.chromium.org/svn/trunk/deps/third_party/nss
Patch Set: Remove unused function SEC_NumberOrNameStringToOIDTag Created 6 years, 6 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 /* 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 #ifndef _SECMODT_H_ 4 #ifndef _SECMODT_H_
5 #define _SECMODT_H_ 1 5 #define _SECMODT_H_ 1
6 6
7 #include "nssrwlkt.h" 7 #include "nssrwlkt.h"
8 #include "nssilckt.h" 8 #include "nssilckt.h"
9 #include "secoid.h" 9 #include "secoid.h"
10 #include "secasn1.h" 10 #include "secasn1.h"
(...skipping 109 matching lines...) Expand 10 before | Expand all | Expand 10 after
120 PK11CertListRootUnique = 2, /* get one instance of CA certs without a priva te key. 120 PK11CertListRootUnique = 2, /* get one instance of CA certs without a priva te key.
121 * deprecated. Use PK11CertListCAUnique 121 * deprecated. Use PK11CertListCAUnique
122 */ 122 */
123 PK11CertListCA = 3, /* get all instances of CA certs */ 123 PK11CertListCA = 3, /* get all instances of CA certs */
124 PK11CertListCAUnique = 4, /* get one instance of CA certs */ 124 PK11CertListCAUnique = 4, /* get one instance of CA certs */
125 PK11CertListUserUnique = 5, /* get one instance of user certs */ 125 PK11CertListUserUnique = 5, /* get one instance of user certs */
126 PK11CertListAll = 6 /* get all instances of all certs */ 126 PK11CertListAll = 6 /* get all instances of all certs */
127 } PK11CertListType; 127 } PK11CertListType;
128 128
129 /* 129 /*
130 * Entry into the Array which lists all the legal bits for the default flags 130 * Entry into the array which lists all the legal bits for the default flags
131 * in the slot, their definition, and the PKCS #11 mechanism the represent 131 * in the slot, their definition, and the PKCS #11 mechanism they represent.
132 * Always Statically allocated. 132 * Always statically allocated.
133 */ 133 */
134 struct PK11DefaultArrayEntryStr { 134 struct PK11DefaultArrayEntryStr {
135 char *name; 135 const char *name;
136 unsigned long flag; 136 unsigned long flag;
137 unsigned long mechanism; /* this is a long so we don't include the 137 unsigned long mechanism; /* this is a long so we don't include the
138 * whole pkcs 11 world to use this header */ 138 * whole pkcs 11 world to use this header */
139 }; 139 };
140 140
141 /* 141 /*
142 * PK11AttrFlags 142 * PK11AttrFlags
143 * 143 *
144 * A 32-bit bitmask of PK11_ATTR_XXX flags 144 * A 32-bit bitmask of PK11_ATTR_XXX flags
145 */ 145 */
(...skipping 293 matching lines...) Expand 10 before | Expand all | Expand 10 after
439 int version; 439 int version;
440 unsigned long reserved1; 440 unsigned long reserved1;
441 unsigned long reserved2; 441 unsigned long reserved2;
442 unsigned long reserved3; 442 unsigned long reserved3;
443 void *reserverd4; 443 void *reserverd4;
444 void *reserverd5; 444 void *reserverd5;
445 }; 445 };
446 446
447 447
448 #endif /*_SECMODT_H_ */ 448 #endif /*_SECMODT_H_ */
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698