Expose OpenSSL's key_exchange_info in the content API

net/http/http_response_info.cc

Index: net/http/http_response_info.cc
diff --git a/net/http/http_response_info.cc b/net/http/http_response_info.cc
index c6be3e65a4fc86847db36f9e92b35bb14ece3cdf..0fa38f0f2bed8c213d4be4566d4dc875633df340 100644
--- a/net/http/http_response_info.cc
+++ b/net/http/http_response_info.cc
@@ -93,6 +93,9 @@ enum {
 
   RESPONSE_INFO_UNUSED_SINCE_PREFETCH = 1 << 21,
 
+  // This bit is set if the response has a key-exchange-info field at the end.
+  RESPONSE_INFO_HAS_KEY_EXCHANGE_INFO = 1 << 22,
+
   // TODO(darin): Add other bits to indicate alternate request methods.
   // For now, we don't support storing those.
 };
@@ -273,6 +276,14 @@ bool HttpResponseInfo::InitFromPickle(const base::Pickle& pickle,
     }
   }
 
+  // Read key_exchange_info
+  if (flags & RESPONSE_INFO_HAS_KEY_EXCHANGE_INFO) {
+    int key_exchange_info;
+    if (!iter.ReadInt(&key_exchange_info))
+      return false;
+    ssl_info.key_exchange_info = key_exchange_info;

[Ryan Sleevi, 2015/09/15 08:23:21]

Is there any validation of |key_exchange_info| that can or should be done after
deserialization?

[sigbjorn, 2015/09/15 08:34:35]

This is modelled on security_bits above, which is an int with similar
characteristics. No further checks are done there. It would be possible to
verify it being non-negative in both places.

[estark, 2015/09/15 14:37:49]

|security_bits| can be -1 and it is actually sanity-checked in
DeserializeSecurityInfo:
https://code.google.com/p/chromium/codesearch#chromium/src/content/common/ssl...

[sigbjorn, 2015/09/15 15:10:56]

|key_exchange_info| is already sanity-checked in DeserializeSecurityInfo.

+  }
+
   was_fetched_via_spdy = (flags & RESPONSE_INFO_WAS_SPDY) != 0;
 
   was_npn_negotiated = (flags & RESPONSE_INFO_WAS_NPN) != 0;
@@ -297,6 +308,8 @@ void HttpResponseInfo::Persist(base::Pickle* pickle,
     flags |= RESPONSE_INFO_HAS_CERT_STATUS;
     if (ssl_info.security_bits != -1)
       flags |= RESPONSE_INFO_HAS_SECURITY_BITS;
+    if (ssl_info.key_exchange_info != 0)
+      flags |= RESPONSE_INFO_HAS_KEY_EXCHANGE_INFO;
     if (ssl_info.connection_status != 0)
       flags |= RESPONSE_INFO_HAS_SSL_CONNECTION_STATUS;
   }
@@ -368,6 +381,10 @@ void HttpResponseInfo::Persist(base::Pickle* pickle,
 
   if (connection_info != CONNECTION_INFO_UNKNOWN)
     pickle->WriteInt(static_cast<int>(connection_info));
+
+  // Write key_exchange_info here to provide backwards compatibility

[Ryan Sleevi, 2015/09/15 08:23:21]

Drop this comment; doesn't feel like it's adding much, especially if someone is
fresh reading this file.

(In particular, ambiguity regarding 'here' compared to....? that knowledge is
only clear from the context of this CL, not from the source itself)

[sigbjorn, 2015/09/15 08:34:35]

Done.

+  if (ssl_info.is_valid() && ssl_info.key_exchange_info != 0)
+    pickle->WriteInt(ssl_info.key_exchange_info);
 }
 
 HttpResponseInfo::ConnectionInfo HttpResponseInfo::ConnectionInfoFromNextProto(