diff options
| author | rtenneti@chromium.org <rtenneti@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-10 03:57:54 +0000 |
|---|---|---|
| committer | rtenneti@chromium.org <rtenneti@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-10 03:57:54 +0000 |
| commit | 6d1b4ed17cbad3f89394490b287a29108037567b (patch) | |
| tree | 5ee638a15ff19160b26decc8d8a2f46f02ad9ef5 /net/socket/ssl_client_socket.cc | |
| parent | 929fb4e415bec4565b9eea7254f5ac019c7648b5 (diff) | |
| download | chromium_src-6d1b4ed17cbad3f89394490b287a29108037567b.zip chromium_src-6d1b4ed17cbad3f89394490b287a29108037567b.tar.gz chromium_src-6d1b4ed17cbad3f89394490b287a29108037567b.tar.bz2 | |
First step at enabling QUIC over HTTPS.
- Added code to enable proof verifier and integrated CertVerifier.
TODO:
- Make ProofVerifier work with multiple verifications at the same time.
- Use the correct NPN for NextProto instead of kProtoSPDY3.
- Write unit tests for QUIC over HTTPS.
R=rch@chromium.org
Review URL: https://chromiumcodereview.appspot.com/18084015
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@210732 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/socket/ssl_client_socket.cc')
| -rw-r--r-- | net/socket/ssl_client_socket.cc | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/net/socket/ssl_client_socket.cc b/net/socket/ssl_client_socket.cc index 2b73a1b..70b2a87 100644 --- a/net/socket/ssl_client_socket.cc +++ b/net/socket/ssl_client_socket.cc @@ -30,6 +30,8 @@ NextProto SSLClientSocket::NextProtoFromString( return kProtoSPDY31; } else if (proto_string == "spdy/4a2") { return kProtoSPDY4a2; + } else if (proto_string == "quic/1+spdy/3") { + return kProtoQUIC1SPDY3; } else { return kProtoUnknown; } @@ -50,6 +52,8 @@ const char* SSLClientSocket::NextProtoToString(NextProto next_proto) { return "spdy/3.1"; case kProtoSPDY4a2: return "spdy/4a2"; + case kProtoQUIC1SPDY3: + return "quic/1+spdy/3"; default: break; } |