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

Unified Diff: nss/lib/pk11wrap/secmodti.h

Issue 16132005: Allow NSS to be built with NO_NSPR_10_SUPPORT. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/deps/third_party/nss/
Patch Set: Created 7 years, 7 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 | « nss/lib/pk11wrap/secmodi.h ('k') | nss/lib/pkcs7/certread.c » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: nss/lib/pk11wrap/secmodti.h
===================================================================
--- nss/lib/pk11wrap/secmodti.h (revision 203524)
+++ nss/lib/pk11wrap/secmodti.h (working copy)
@@ -72,17 +72,17 @@
* seconds */
int authTransact; /* allow multiple authentications off one password if
* they are all part of the same transaction */
- int64 authTime; /* when were we last authenticated */
+ PRTime authTime; /* when were we last authenticated */
int minPassword; /* smallest legal password */
int maxPassword; /* largest legal password */
- uint16 series; /* break up the slot info into various groups of
+ PRUint16 series; /* break up the slot info into various groups of
* inserted tokens so that keys and certs can be
* invalidated */
- uint16 flagSeries; /* record the last series for the last event
+ PRUint16 flagSeries;/* record the last series for the last event
* returned for this slot */
PRBool flagState; /* record the state of the last event returned for this
* slot. */
- uint16 wrapKey; /* current wrapping key for SSL master secrets */
+ PRUint16 wrapKey; /* current wrapping key for SSL master secrets */
CK_MECHANISM_TYPE wrapMechanism;
/* current wrapping mechanism for current wrapKey */
CK_OBJECT_HANDLE refKeys[1]; /* array of existing wrapping keys for */
@@ -128,7 +128,7 @@
PK11Origin origin; /* where this key came from
* (see def in secmodt.h) */
PK11SymKey *parent; /* potential owner key of the session */
- uint16 series; /* break up the slot info into various groups
+ PRUint16 series; /* break up the slot info into various groups
* of inserted tokens so that keys and certs
* can be invalidated */
void *userData; /* random data the application can attach to
« no previous file with comments | « nss/lib/pk11wrap/secmodi.h ('k') | nss/lib/pkcs7/certread.c » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698