← Back to branch summary

~ubuntu-branches/ubuntu/lucid/seamonkey/lucid-security

« back to all changes in this revision

Viewing changes to security/nss/lib/softoken/pkcs11i.h

  • Committer: Bazaar Package Importer
  • Author(s): Fabien Tassin
  • Date: 2008-07-29 21:29:02 UTC
  • mfrom: (1.1.4 upstream)
  • Revision ID: james.westby@ubuntu.com-20080729212902-spm9kpvchp9udwbw
Tags: 1.1.11+nobinonly-0ubuntu1
https://launchpad.net/bugs/218534
* New security upstream release: 1.1.11 (LP: #218534)
  Fixes USN-602-1, USN-619-1, USN-623-1 and USN-629-1
* Refresh diverged patch:
  - update debian/patches/80_security_build.patch
* Fix FTBFS with missing -lfontconfig
  - add debian/patches/11_fix_ftbfs_with_fontconfig.patch
  - update debian/patches/series
* Build with default gcc (hardy: 4.2, intrepid: 4.3)
  - update debian/rules
  - update debian/control

Show diffs side-by-side

added added

removed removed

Lines of Context:
security/nss/lib/softoken/pkcs11i.h
88
88
 * NSS is a shared library.
89
89
 */
90
90
#define SPACE_ATTRIBUTE_HASH_SIZE 32 
91
 
#define SPACE_TOKEN_OBJECT_HASH_SIZE 32
 
91
#define SPACE_SESSION_OBJECT_HASH_SIZE 32
92
92
#define SPACE_SESSION_HASH_SIZE 32
93
93
#define TIME_ATTRIBUTE_HASH_SIZE 32
94
 
#define TIME_TOKEN_OBJECT_HASH_SIZE 1024
 
94
#define TIME_SESSION_OBJECT_HASH_SIZE 1024
95
95
#define TIME_SESSION_HASH_SIZE 1024
96
96
#define MAX_OBJECT_LIST_SIZE 800  
97
97
                                  /* how many objects to keep on the free list
319
319
 *
320
320
 * The array of sessionLock's protect the session hash table (head[])
321
321
 * as well as the reference count of session objects in that bucket
322
 
 * (head[]->refCount),  objectLock protects all elements of the token
323
 
 * object hash table (tokObjects[], tokenIDCount, and tokenHashTable),
 
322
 * (head[]->refCount),  objectLock protects all elements of the slot's
 
323
 * object hash tables (sessObjHashTable[] and tokObjHashTable), and
 
324
 * sessionObjectHandleCount.
324
325
 * slotLock protects the remaining protected elements:
325
326
 * password, isLoggedIn, ssoLoggedIn, and sessionCount,
326
327
 * and pwCheckLock serializes the key database password checks in
366
367
    int                 sessionCount;           /* variable - reset */
367
368
    PRInt32             rwSessionCount;         /* set by atomic operations */
368
369
                                                /* (reset) */
369
 
    int                 tokenIDCount;           /* variable - perserved */
 
370
    PRUint32            sessionObjectHandleCount; /* variable - preserved */
370
371
    int                 index;                  /* invariant */
371
 
    PLHashTable         *tokenHashTable;        /* invariant */
372
 
    SFTKObject          **tokObjects;           /* variable - reset */
373
 
    unsigned int        tokObjHashSize;         /* invariant */
 
372
    PLHashTable         *tokObjHashTable;       /* invariant */
 
373
    SFTKObject          **sessObjHashTable;     /* variable - reset */
 
374
    unsigned int        sessObjHashSize;        /* invariant */
374
375
    SFTKSession         **head;                 /* variable -reset */
375
376
    unsigned int        sessHashSize;           /* invariant */
376
377
    char                tokDescription[33];     /* per load */