Allow the SSL session cache on Win/Mac to be used even after a client cert key is removed

net/third_party/nss/ssl/sslimpl.h

 /*
  * This file is PRIVATE to SSL and should be the first thing included by
  * any SSL implementation file.
  *
  * ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1
  *
  * The contents of this file are subject to the Mozilla Public License Version
  * 1.1 (the "License"); you may not use this file except in compliance with
  * the License. You may obtain a copy of the License at
@@ skipping 662 matching lines @@
             /* The following values pertain to the slot that did the signature
             ** for client auth.   (used only in client)
             */
             SECMODModuleID    clAuthModuleID;
             CK_SLOT_ID        clAuthSlotID;
             PRUint16          clAuthSeries;
 
             char              masterValid;
             char              clAuthValid;
 
-#ifdef NSS_PLATFORM_CLIENT_AUTH
-            PlatformAuthInfo  clPlatformAuthInfo;
-            char              clPlatformAuthValid;
-#endif  /* NSS_PLATFORM_CLIENT_AUTH */
-
             /* Session ticket if we have one, is sent as an extension in the
              * ClientHello message.  This field is used by clients.
              */
             NewSessionTicket  sessionTicket;
             SECItem           srvName;
         } ssl3;
     } u;
 };
 
 
@@ skipping 1048 matching lines @@
 extern SECStatus ssl_InitSessionCacheLocks(PRBool lazyInit);
 
 extern SECStatus ssl_FreeSessionCacheLocks(void);
 
 /***************** platform client auth ****************/
 
 #ifdef NSS_PLATFORM_CLIENT_AUTH
 // Releases the platform key.
 extern void ssl_FreePlatformKey(PlatformKey key);
 
-// Frees any memory allocated to store a persistent reference to the
-// platform key.
-extern void ssl_FreePlatformAuthInfo(PlatformAuthInfo* info);
-
-// Initializes the PlatformAuthInfo to empty/invalid values.
-extern void ssl_InitPlatformAuthInfo(PlatformAuthInfo* info);
-
-// Determine if the given key is still present in the system. This is used
-// to check for things like smart cards being ejected after handshaking,
-// since no further operations on the key will happen which would detect this.
-extern PRBool ssl_PlatformAuthTokenPresent(PlatformAuthInfo* info);
-
-// Obtain a persistent reference to a key, sufficient for
-// ssl_PlatformAuthTokenPresent to determine if the key is still present.
-extern void ssl_GetPlatformAuthInfoForKey(PlatformKey key,
-                                          PlatformAuthInfo* info);
-
 // Implement the client CertificateVerify message for SSL3/TLS1.0
 extern SECStatus ssl3_PlatformSignHashes(SSL3Hashes *hash,
                                          PlatformKey key, SECItem *buf,
                                          PRBool isTLS);
 
 // Converts a CERTCertList* (A collection of CERTCertificates) into a
 // CERTCertificateList* (A collection of SECItems), or returns NULL if
 // it cannot be converted.
 // This is to allow the platform-supplied chain to be created with purely
 // public API functions, using the preferred CERTCertList mutators, rather
@@ skipping 36 matching lines @@
 #elif defined(_WIN32_WCE)
 #define SSL_GETPID GetCurrentProcessId
 #elif defined(WIN32)
 extern int __cdecl _getpid(void);
 #define SSL_GETPID _getpid
 #else
 #define SSL_GETPID() 0
 #endif
 
 #endif /* __sslimpl_h_ */