Implements new, more robust design for communicating between SSLConnectJobs.

net/socket/ssl_session_cache_openssl.h

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef NET_SOCKET_SSL_SESSION_CACHE_OPENSSL_H
 #define NET_SOCKET_SSL_SESSION_CACHE_OPENSSL_H
 
 #include <string>
 
 #include "base/basictypes.h"
+#include "base/callback.h"

[wtc, 2014/07/08 01:25:43]

Include base/callback_forward.h instead for the forward declaration of
base::Closure.

[mshelley, 2014/07/09 19:51:02]

I'm not positive, but I think that I do need to include base/callback.h in order
to call Run() on a Closure. I tried excluding it and got an incomplete type
error.

 #include "net/base/net_export.h"
 
 // Avoid including OpenSSL headers here.
 typedef struct ssl_ctx_st SSL_CTX;
 typedef struct ssl_st SSL;
 
 namespace net {
 
 class SSLSessionCacheOpenSSLImpl;
 
@@ skipping 85 matching lines @@
   // ensure that the value of |cache_key| matches the result of calling the
   // configuration's |key_func| function with the |ssl| as parameter.
   //
   // Every |check_expiration_count| call to either SetSSLSession() or
   // SetSSLSessionWithKey() triggers a check for, and removal of, expired
   // sessions.
   //
   // Return true iff a cached session was associated with the |ssl| connection.
   bool SetSSLSessionWithKey(SSL* ssl, const std::string& cache_key);
 
+  // Return true iff a cached session was associated with the given |cache_key|.
+  bool SSLSessionIsInCache(const std::string& cache_key) const;
+
+  // Informs the cache that it should run the messenger's callback when |ssl|'s

[wtc, 2014/07/08 01:25:43]

Remove "messenger's". In this file, "messenger" isn't defined.

[mshelley, 2014/07/09 19:51:02]

Done.

+  // session is added to the cache.
+  void NotifyOnSessionAdded(SSL* ssl, const base::Closure& callback);
+
   // Indicates that the SSL session associated with |ssl| is "good" - that is,
   // that all associated cryptographic parameters that were negotiated,
   // including the peer's certificate, were successfully validated. Because
   // OpenSSL does not provide an asynchronous certificate verification
   // callback, it's necessary to manually manage the sessions to ensure that
   // only validated sessions are resumed.
   void MarkSSLSessionAsGood(SSL* ssl);
 
   // Flush removes all entries from the cache. This is typically called when
   // the system's certificate store has changed.
   void Flush();
 
   // TODO(digit): Move to client code.
   static const int kDefaultTimeoutSeconds = 60 * 60;
   static const size_t kMaxEntries = 1024;
   static const size_t kMaxExpirationChecks = 256;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(SSLSessionCacheOpenSSL);
 
   SSLSessionCacheOpenSSLImpl* impl_;
 };
 
 }  // namespace net
 
 #endif  // NET_SOCKET_SSL_SESSION_CACHE_OPENSSL_H