Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1753)

Unified Diff: net/socket/ssl_client_socket.cc

Issue 353713005: Implements new, more robust design for communicating between SSLConnectJobs. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Prevent certain tests from running when USE_OPENSSL is not defined. Created 6 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: net/socket/ssl_client_socket.cc
diff --git a/net/socket/ssl_client_socket.cc b/net/socket/ssl_client_socket.cc
index 1b2fe144304955bd0c423aca96d90226c45d7f4a..a2e294a38b9fbdf6eba508d9a31255c2864018a2 100644
--- a/net/socket/ssl_client_socket.cc
+++ b/net/socket/ssl_client_socket.cc
@@ -7,6 +7,7 @@
#include "base/metrics/histogram.h"
#include "base/strings/string_util.h"
#include "crypto/ec_private_key.h"
+#include "net/base/host_port_pair.h"
#include "net/ssl/server_bound_cert_service.h"
#include "net/ssl/ssl_config_service.h"
@@ -103,6 +104,16 @@ NextProto SSLClientSocket::GetNegotiatedProtocol() const {
return protocol_negotiated_;
}
+// static
+std::string SSLClientSocket::CreateSessionCacheKey(
+ const HostPortPair& host_and_port,
+ const std::string& ssl_session_cache_shard) {
+ std::string result = host_and_port.ToString();
+ result.append("/");
+ result.append(ssl_session_cache_shard);
+ return result;
+}
+
bool SSLClientSocket::IgnoreCertError(int error, int load_flags) {
if (error == OK || load_flags & LOAD_IGNORE_ALL_CERT_ERRORS)
return true;

Powered by Google App Engine
This is Rietveld 408576698