← Back to branch summary

~ubuntu-branches/ubuntu/feisty/firefox/feisty-updates

« back to all changes in this revision

Viewing changes to security/nss/lib/ssl/sslsnce.c

  • Committer: Bazaar Package Importer
  • Author(s): Alexander Sack, Alexander Sack
  • Date: 2008-06-23 15:08:12 UTC
  • mfrom: (1.1.24 upstream)
  • Revision ID: james.westby@ubuntu.com-20080623150812-sxdwhn3dz9pmapvf
Tags: 2.0.0.15+0nobinonly-0ubuntu0.7.4
[ Alexander Sack ]
* New security/stability upstream release (v2.0.0.15)
  - see USN-619-1

Show diffs side-by-side

added added

removed removed

Lines of Context:
security/nss/lib/ssl/sslsnce.c
36
36
 * the terms of any one of the MPL, the GPL or the LGPL.
37
37
 *
38
38
 * ***** END LICENSE BLOCK ***** */
39
 
/* $Id: sslsnce.c,v 1.36.2.3 2006/12/06 01:38:30 wtchang%redhat.com Exp $ */
 
39
/* $Id: sslsnce.c,v 1.36.2.4 2007/05/03 21:26:04 glen.beasley%sun.com Exp $ */
40
40
 
41
41
/* Note: ssl_FreeSID() in sslnonce.c gets used for both client and server 
42
42
 * cache sids!
152
152
/*  4 */    SSL3KEAType exchKeyType;
153
153
/*  4 */    PRInt32     certIndex;
154
154
/*116 */} ssl3;
155
 
#if defined(LINUX)                      /* XXX Why only on Linux ? */
156
 
        struct {
157
 
            PRUint8     filler[144];    /* XXX why this number ? */
 
155
/* force sizeof(sidCacheEntry) to be a multiple of cache line size */
 
156
        struct {
 
157
/*120 */    PRUint8     filler[120]; /* 72+120==196, a multiple of 16 */
158
158
        } forceSize;
159
 
#endif
160
159
    } u;
161
160
};
162
161
typedef struct sidCacheEntryStr sidCacheEntry;
1153
1152
#if defined(DEBUG_nelsonb)
1154
1153
    printf("sizeof(sidCacheEntry) == %u\n", sizeof(sidCacheEntry));
1155
1154
#endif
1156
 
#if !(defined(SOLARIS) && defined(i386))
1157
 
#ifndef XP_OS2
1158
 
    PORT_Assert(sizeof(sidCacheEntry) % 8 == 0);
1159
 
#endif
1160
 
#endif
 
1155
    PORT_Assert(sizeof(sidCacheEntry) == 192);
1161
1156
    PORT_Assert(sizeof(certCacheEntry) == 4096);
1162
1157
 
1163
1158
    myPid = SSL_GETPID();