diff options
| author | joth@chromium.org <joth@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-09 18:36:24 +0000 |
|---|---|---|
| committer | joth@chromium.org <joth@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-09 18:36:24 +0000 |
| commit | 32e1dee439ca0946f80508eeeedaebfbc2cc907c (patch) | |
| tree | 3e68eab1434a4b69ce1f7914097665d15f6e8e19 /net/socket/ssl_client_socket_openssl.cc | |
| parent | f9bd583cdd7c42c98ef5c6afb25366c1cdfec2bf (diff) | |
| download | chromium_src-32e1dee439ca0946f80508eeeedaebfbc2cc907c.zip chromium_src-32e1dee439ca0946f80508eeeedaebfbc2cc907c.tar.gz chromium_src-32e1dee439ca0946f80508eeeedaebfbc2cc907c.tar.bz2 | |
Switch linux OpenSSL build to use custom openssl version
This allows us to test experimental library features, and to track a known openssl version.
Also bumps OpenSSL 65717:68738, to fix up the default CA root path in the reference library.
BUG=None
TEST=Still builds & runs!
Review URL: http://codereview.chromium.org/5625012
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@68749 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/socket/ssl_client_socket_openssl.cc')
| -rw-r--r-- | net/socket/ssl_client_socket_openssl.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/socket/ssl_client_socket_openssl.cc b/net/socket/ssl_client_socket_openssl.cc index 62e0e72..b3690a9 100644 --- a/net/socket/ssl_client_socket_openssl.cc +++ b/net/socket/ssl_client_socket_openssl.cc @@ -764,7 +764,7 @@ int SSLClientSocketOpenSSL::SelectNextProtoCallback(unsigned char** out, unsigned int inlen) { #if defined(OPENSSL_NPN_NEGOTIATED) if (ssl_config_.next_protos.empty()) { - *out = "http/1.1"; + *out = reinterpret_cast<uint8*>(const_cast<char*>("http/1.1")); *outlen = 8; npn_status_ = SSLClientSocket::kNextProtoUnsupported; return SSL_TLSEXT_ERR_OK; @@ -790,6 +790,7 @@ int SSLClientSocketOpenSSL::SelectNextProtoCallback(unsigned char** out, NOTREACHED() << status; break; } + DVLOG(2) << "next protocol: '" << npn_proto_ << "' status: " << npn_status_; #endif return SSL_TLSEXT_ERR_OK; } |