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

Side by Side Diff: mozilla/security/nss/lib/cryptohi/keythi.h

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: Merge nss-static2.patch into nss-static.patch 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 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 _KEYTHI_H_ 4 #ifndef _KEYTHI_H_
5 #define _KEYTHI_H_ 1 5 #define _KEYTHI_H_ 1
6 6
7 #include "plarena.h" 7 #include "plarena.h"
8 #include "pkcs11t.h" 8 #include "pkcs11t.h"
9 #include "secmodt.h" 9 #include "secmodt.h"
10 #include "prclist.h" 10 #include "prclist.h"
(...skipping 185 matching lines...) Expand 10 before | Expand all | Expand 10 after
196 SECKEYFortezzaPublicKey fortezza; 196 SECKEYFortezzaPublicKey fortezza;
197 SECKEYECPublicKey ec; 197 SECKEYECPublicKey ec;
198 } u; 198 } u;
199 }; 199 };
200 typedef struct SECKEYPublicKeyStr SECKEYPublicKey; 200 typedef struct SECKEYPublicKeyStr SECKEYPublicKey;
201 201
202 /* bit flag definitions for staticflags */ 202 /* bit flag definitions for staticflags */
203 #define SECKEY_Attributes_Cached 0x1 /* bit 0 states 203 #define SECKEY_Attributes_Cached 0x1 /* bit 0 states
204 whether attributes are cached */ 204 whether attributes are cached */
205 #define SECKEY_CKA_PRIVATE (1U << 1) /* bit 1 is the value of CKA_PRIVATE */ 205 #define SECKEY_CKA_PRIVATE (1U << 1) /* bit 1 is the value of CKA_PRIVATE */
206 #define SECKEY_CKA_ALWAYS_AUTHENTICATE (1U << 2)
206 207
207 #define SECKEY_ATTRIBUTES_CACHED(key) \ 208 #define SECKEY_ATTRIBUTES_CACHED(key) \
208 (0 != (key->staticflags & SECKEY_Attributes_Cached)) 209 (0 != (key->staticflags & SECKEY_Attributes_Cached))
209 210
210 #define SECKEY_ATTRIBUTE_VALUE(key,attribute) \ 211 #define SECKEY_ATTRIBUTE_VALUE(key,attribute) \
211 (0 != (key->staticflags & SECKEY_##attribute)) 212 (0 != (key->staticflags & SECKEY_##attribute))
212 213
213 #define SECKEY_HAS_ATTRIBUTE_SET(key,attribute) \ 214 #define SECKEY_HAS_ATTRIBUTE_SET(key,attribute) \
214 (0 != (key->staticflags & SECKEY_Attributes_Cached)) ? \ 215 (0 != (key->staticflags & SECKEY_Attributes_Cached)) ? \
215 (0 != (key->staticflags & SECKEY_##attribute)) : \ 216 (0 != (key->staticflags & SECKEY_##attribute)) : \
(...skipping 27 matching lines...) Expand all
243 PRCList links; 244 PRCList links;
244 SECKEYPublicKey *key; 245 SECKEYPublicKey *key;
245 } SECKEYPublicKeyListNode; 246 } SECKEYPublicKeyListNode;
246 247
247 typedef struct { 248 typedef struct {
248 PRCList list; 249 PRCList list;
249 PLArenaPool *arena; 250 PLArenaPool *arena;
250 } SECKEYPublicKeyList; 251 } SECKEYPublicKeyList;
251 #endif /* _KEYTHI_H_ */ 252 #endif /* _KEYTHI_H_ */
252 253
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698