Merge Chromium at r65505: Initial merge by git.

Change-Id: I31d8f1d8cd33caaf7f47ffa7350aef42d5fbdb45

1 files changed, 23 insertions, 0 deletions

diff --git a/net/base/ssl_connection_status_flags.h b/net/base/ssl_connection_status_flags.h
index 1b7640c..9596f00 100644
--- a/net/base/ssl_connection_status_flags.h
+++ b/net/base/ssl_connection_status_flags.h
@@ -27,10 +27,28 @@ 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,
+
   // 1 << 31 (the sign bit) is reserved so that the SSL connection status will
   // never be negative.
 };
 
+// NOTE: the SSL version enum constants must be between 0 and
+// SSL_CONNECTION_VERSION_MASK, inclusive.
+enum {
+  SSL_CONNECTION_VERSION_UNKNOWN = 0,  // Unknown SSL version.
+  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,
+  SSL_CONNECTION_VERSION_MAX,
+};
+COMPILE_ASSERT(SSL_CONNECTION_VERSION_MAX - 1 <= SSL_CONNECTION_VERSION_MASK,
+               SSL_CONNECTION_VERSION_MASK_too_small);
+
 inline int SSLConnectionStatusToCipherSuite(int connection_status) {
   return (connection_status >> SSL_CONNECTION_CIPHERSUITE_SHIFT) &
          SSL_CONNECTION_CIPHERSUITE_MASK;
@@ -41,6 +59,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_