diff options
| author | wtc@chromium.org <wtc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-04 16:18:35 +0000 |
|---|---|---|
| committer | wtc@chromium.org <wtc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-04 16:18:35 +0000 |
| commit | 72a9ba049f24f37417c04fa504a736516303611d (patch) | |
| tree | b6b3197b9b2d382a08facd2ccc4764e9adf2c458 /net/ssl | |
| parent | 1e0a16ac12cee3962e94ee3891a669fefd263da2 (diff) | |
| download | chromium_src-72a9ba049f24f37417c04fa504a736516303611d.zip chromium_src-72a9ba049f24f37417c04fa504a736516303611d.tar.gz chromium_src-72a9ba049f24f37417c04fa504a736516303611d.tar.bz2 | |
Update QuicClientSession::GetSSLInfo to report QUIC as the protocol
version and handle the new AEAD algorithm kCC12 (ChaCha20).
Fix a bug that kAESG (AES-GCM) was reported as 256 bits. QUIC uses
128-bit AES keys.
MockCryptoClientStream::CryptoConnect needs to mock the negotiated
aead parameter.
R=rch@chromium.org,rtenneti@chromium.org,agl@chromium.org
BUG=none
Review URL: https://codereview.chromium.org/223593006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@261771 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/ssl')
| -rw-r--r-- | net/ssl/ssl_cipher_suite_names.cc | 3 | ||||
| -rw-r--r-- | net/ssl/ssl_connection_status_flags.h | 2 |
2 files changed, 5 insertions, 0 deletions
diff --git a/net/ssl/ssl_cipher_suite_names.cc b/net/ssl/ssl_cipher_suite_names.cc index 8204fc1..f018857 100644 --- a/net/ssl/ssl_cipher_suite_names.cc +++ b/net/ssl/ssl_cipher_suite_names.cc @@ -323,6 +323,9 @@ void SSLVersionToString(const char** name, int ssl_version) { case SSL_CONNECTION_VERSION_TLS1_2: *name = "TLS 1.2"; break; + case SSL_CONNECTION_VERSION_QUIC: + *name = "QUIC"; + break; default: NOTREACHED() << ssl_version; *name = "???"; diff --git a/net/ssl/ssl_connection_status_flags.h b/net/ssl/ssl_connection_status_flags.h index 08d585f..0575755 100644 --- a/net/ssl/ssl_connection_status_flags.h +++ b/net/ssl/ssl_connection_status_flags.h @@ -43,6 +43,8 @@ enum { SSL_CONNECTION_VERSION_TLS1 = 3, SSL_CONNECTION_VERSION_TLS1_1 = 4, SSL_CONNECTION_VERSION_TLS1_2 = 5, + // Reserve 6 for TLS 1.3. + SSL_CONNECTION_VERSION_QUIC = 7, SSL_CONNECTION_VERSION_MAX, }; COMPILE_ASSERT(SSL_CONNECTION_VERSION_MAX - 1 <= SSL_CONNECTION_VERSION_MASK, |