Reland r209278

net/third_party/nss/ssl/sslsnce.c

 /* This file implements the SERVER Session ID cache. 
  * NOTE:  The contents of this file are NOT used by the client.
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 /* $Id$ */
 
 /* Note: ssl_FreeSID() in sslnonce.c gets used for both client and server 
  * cache sids!
@@ skipping 69 matching lines @@
 #endif
 
 #endif 
 #include <sys/types.h>
 
 #define SET_ERROR_CODE /* reminder */
 
 #include "nspr.h"
 #include "sslmutex.h"
 
-/* AES_256_KEY_LENGTH was added to blapit.h in NSS 3.12.10. */
-#ifndef AES_256_KEY_LENGTH
-#define AES_256_KEY_LENGTH      32  /* bytes */
-#endif
-
 /*
 ** Format of a cache entry in the shared memory.
 */ 
 struct sidCacheEntryStr {
 /* 16 */    PRIPv6Addr  addr;   /* client's IP address */
 /*  4 */    PRUint32    creationTime;
 /*  4 */    PRUint32    lastAccessTime; 
 /*  4 */    PRUint32    expirationTime;
 /*  2 */    PRUint16    version;
 /*  1 */    PRUint8     valid;
@@ skipping 2105 matching lines @@
 }
 
 SECStatus 
 SSL_SetMaxServerCacheLocks(PRUint32 maxLocks)
 {
     PR_ASSERT(!"SSL servers are not supported on this platform. (SSL_SetMaxServerCacheLocks)");
     return SECFailure;
 }
 
 #endif /* XP_UNIX || XP_WIN32 */