diff options
| author | JustOff <Off.Just.Off@gmail.com> | 2018-06-09 15:11:22 +0300 |
|---|---|---|
| committer | JustOff <Off.Just.Off@gmail.com> | 2018-06-11 16:42:50 +0300 |
| commit | f83f62e1bff0c2aedc32e67fe369ba923c5b104a (patch) | |
| tree | fbb69e76754552dde5c3c5d4fe928ed9693f601a /security/nss/lib/dev/devt.h | |
| parent | 75323087aea91719bbb4f766bc6298d0618f0163 (diff) | |
| download | UXP-f83f62e1bff0c2aedc32e67fe369ba923c5b104a.tar UXP-f83f62e1bff0c2aedc32e67fe369ba923c5b104a.tar.gz UXP-f83f62e1bff0c2aedc32e67fe369ba923c5b104a.tar.lz UXP-f83f62e1bff0c2aedc32e67fe369ba923c5b104a.tar.xz UXP-f83f62e1bff0c2aedc32e67fe369ba923c5b104a.zip | |
Update NSS to 3.36.4-RTM
Diffstat (limited to 'security/nss/lib/dev/devt.h')
| -rw-r--r-- | security/nss/lib/dev/devt.h | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/security/nss/lib/dev/devt.h b/security/nss/lib/dev/devt.h index db93deb12..0f6d9e49a 100644 --- a/security/nss/lib/dev/devt.h +++ b/security/nss/lib/dev/devt.h @@ -70,6 +70,14 @@ struct nssSlotAuthInfoStr { PRIntervalTime askPasswordTimeout; }; +/* values for lastTokenPingState */ +typedef enum { + nssSlotLastPingState_Reset = 0, /* the state has just been reset, discard + * our cache */ + nssSlotLastPingState_Update = 1, /* we are updating the lastTokenPingTime */ + nssSlotLastPingState_Valid = 2, /* lastTokenPingTime is valid */ +} nssSlotLastPingState; + struct NSSSlotStr { struct nssDeviceBaseStr base; NSSModule *module; /* Parent */ @@ -77,10 +85,14 @@ struct NSSSlotStr { CK_SLOT_ID slotID; CK_FLAGS ckFlags; /* from CK_SLOT_INFO.flags */ struct nssSlotAuthInfoStr authInfo; - PRIntervalTime lastTokenPing; + PRIntervalTime lastTokenPingTime; + nssSlotLastPingState lastTokenPingState; PZLock *lock; void *epv; PK11SlotInfo *pk11slot; + PZLock *isPresentLock; + PRCondVar *isPresentCondition; + PRThread *isPresentThread; }; struct nssSessionStr { |