diff options
| author | wtc@chromium.org <wtc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-27 23:28:35 +0000 |
|---|---|---|
| committer | wtc@chromium.org <wtc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-27 23:28:35 +0000 |
| commit | 757f2e2ba0c1fa7100461745bfac865e3da1d976 (patch) | |
| tree | 5ada8a2ea4122f949104663b3a02c54c3ba31720 /net/base/ssl_connection_status_flags.h | |
| parent | 017f19b5f1af1702252655b4b52bdcd9ab7a0de2 (diff) | |
| download | chromium_src-757f2e2ba0c1fa7100461745bfac865e3da1d976.zip chromium_src-757f2e2ba0c1fa7100461745bfac865e3da1d976.tar.gz chromium_src-757f2e2ba0c1fa7100461745bfac865e3da1d976.tar.bz2 | |
Report the SSL protocol version in ssl_info.connection_status.
Refactor SSLClientSocketNSS::GetSSLInfo -- the code that sets
ssl_info->connection_status is moved to a new
UpdateConnectionStatus method, and CheckSecureRenegotiation
is subsumed by UpdateConnectionStatus.
R=agl,finnur
BUG=53659
TEST=none
Review URL: http://codereview.chromium.org/4198003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@64178 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/base/ssl_connection_status_flags.h')
| -rw-r--r-- | net/base/ssl_connection_status_flags.h | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/net/base/ssl_connection_status_flags.h b/net/base/ssl_connection_status_flags.h index 1b7640c..51eb884 100644 --- a/net/base/ssl_connection_status_flags.h +++ b/net/base/ssl_connection_status_flags.h @@ -27,6 +27,16 @@ enum { // library that doesn't report it, like SChannel.) SSL_CONNECTION_NO_RENEGOTIATION_EXTENSION = 1 << 19, + // The next three bits are reserved for the SSL version. + SSL_CONNECTION_VERSION_SHIFT = 20, + SSL_CONNECTION_VERSION_MASK = 7, + SSL_CONNECTION_VERSION_UNKNOWN = 0, // Unknown SSL version or SSL not used. + SSL_CONNECTION_VERSION_SSL2 = 1, + SSL_CONNECTION_VERSION_SSL3 = 2, + SSL_CONNECTION_VERSION_TLS1 = 3, + SSL_CONNECTION_VERSION_TLS1_1 = 4, + SSL_CONNECTION_VERSION_TLS1_2 = 5, + // 1 << 31 (the sign bit) is reserved so that the SSL connection status will // never be negative. }; @@ -41,6 +51,11 @@ inline int SSLConnectionStatusToCompression(int connection_status) { SSL_CONNECTION_COMPRESSION_MASK; } +inline int SSLConnectionStatusToVersion(int connection_status) { + return (connection_status >> SSL_CONNECTION_VERSION_SHIFT) & + SSL_CONNECTION_VERSION_MASK; +} + } // namespace net #endif // NET_BASE_SSL_CONNECTION_STATUS_FLAGS_H_ |