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

Unified Diff: net/socket/ssl_client_socket_openssl.cc

Issue 10532061: Select the first protocol from the next protocol list of SSLConfig if If we didn't find a protocol. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 6 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/socket/ssl_client_socket_openssl.cc
===================================================================
--- net/socket/ssl_client_socket_openssl.cc (revision 141188)
+++ net/socket/ssl_client_socket_openssl.cc (working copy)
@@ -42,6 +42,10 @@
const int kSessionCacheTimeoutSeconds = 60 * 60;
const size_t kSessionCacheMaxEntires = 1024;
+// If a client doesn't have a list of protocols that it supports, but
+// the server supports NPN, choosing "http/1.1" is the best answer.
+const char kDefaultSupportedNPNProtocol[] = "http/1.1";
+
// This method doesn't seemed to have made it into the OpenSSL headers.
unsigned long SSL_CIPHER_get_id(const SSL_CIPHER* cipher) { return cipher->id; }
@@ -853,48 +857,43 @@
unsigned int inlen) {
#if defined(OPENSSL_NPN_NEGOTIATED)
if (ssl_config_.next_protos.empty()) {
- *out = reinterpret_cast<uint8*>(const_cast<char*>("http/1.1"));
- *outlen = 8;
- npn_status_ = SSLClientSocket::kNextProtoUnsupported;
+ *out = reinterpret_cast<uint8*>(
+ const_cast<char*>(kDefaultSupportedNPNProtocol));
wtc 2012/06/13 18:01:52 agl: it seems that these const_casts when assignin
+ *outlen = arraysize(kDefaultSupportedNPNProtocol) - 1;
+ npn_status_ = kNextProtoUnsupported;
return SSL_TLSEXT_ERR_OK;
}
// Assume there's no overlap between our protocols and the server's list.
- int status = OPENSSL_NPN_NO_OVERLAP;
- *out = const_cast<unsigned char*>(in) + 1;
- *outlen = in[0];
+ npn_status_ = kNextProtoNoOverlap;
// For each protocol in server preference order, see if we support it.
for (unsigned int i = 0; i < inlen; i += in[i] + 1) {
for (std::vector<std::string>::const_iterator
j = ssl_config_.next_protos.begin();
j != ssl_config_.next_protos.end(); ++j) {
+ // We found a match.
wtc 2012/06/13 18:01:52 Nit: it's better to move this comment into the if
Johnny(Jianning) Ding 2012/06/14 04:50:13 Done. It was to address Ryan's comment, it said "t
if (in[i] == j->size() &&
memcmp(&in[i + 1], j->data(), in[i]) == 0) {
- // We find a match.
*out = const_cast<unsigned char*>(in) + i + 1;
*outlen = in[i];
- status = OPENSSL_NPN_NEGOTIATED;
+ npn_status_ = kNextProtoNegotiated;
break;
}
}
- if (status == OPENSSL_NPN_NEGOTIATED)
+ if (npn_status_ == kNextProtoNegotiated)
break;
}
+ // If we didn't find a protocol, we select the first one from our list.
+ if (npn_status_ == kNextProtoNoOverlap) {
+ *out = reinterpret_cast<uint8*>(const_cast<char*>(
+ ssl_config_.next_protos[0].data()));
+ *outlen = ssl_config_.next_protos[0].size();
+ }
+
npn_proto_.assign(reinterpret_cast<const char*>(*out), *outlen);
server_protos_.assign(reinterpret_cast<const char*>(in), inlen);
- switch (status) {
- case OPENSSL_NPN_NEGOTIATED:
- npn_status_ = SSLClientSocket::kNextProtoNegotiated;
- break;
- case OPENSSL_NPN_NO_OVERLAP:
- npn_status_ = SSLClientSocket::kNextProtoNoOverlap;
- break;
- default:
- NOTREACHED() << status;
- break;
- }
DVLOG(2) << "next protocol: '" << npn_proto_ << "' status: " << npn_status_;
#endif
return SSL_TLSEXT_ERR_OK;
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698