Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(85)

Unified Diff: content/common/ssl_status_serialization.cc

Issue 2272603003: Route key_exchange_group over to DevTools. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix test maybe Created 4 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/common/ssl_status_serialization.cc
diff --git a/content/common/ssl_status_serialization.cc b/content/common/ssl_status_serialization.cc
index 3785d277eafc0a1cc70ce2a39056563bda47803d..024ac0d32fecce897bc5aa3bc3b92790a1507a36 100644
--- a/content/common/ssl_status_serialization.cc
+++ b/content/common/ssl_status_serialization.cc
@@ -56,7 +56,7 @@ std::string SerializeSecurityInfo(const SSLStatus& ssl_status) {
pickle.WriteInt(ssl_status.cert_id);
pickle.WriteUInt32(ssl_status.cert_status);
pickle.WriteInt(ssl_status.security_bits);
- pickle.WriteInt(ssl_status.key_exchange_info);
+ pickle.WriteUInt16(ssl_status.key_exchange_group);
pickle.WriteInt(ssl_status.connection_status);
pickle.WriteUInt32(ssl_status.sct_statuses.size());
for (const auto& sct_status : ssl_status.sct_statuses) {
@@ -80,7 +80,7 @@ bool DeserializeSecurityInfo(const std::string& state, SSLStatus* ssl_status) {
if (!iter.ReadInt(&security_style) || !iter.ReadInt(&ssl_status->cert_id) ||
!iter.ReadUInt32(&ssl_status->cert_status) ||
!iter.ReadInt(&ssl_status->security_bits) ||
- !iter.ReadInt(&ssl_status->key_exchange_info) ||
+ !iter.ReadUInt16(&ssl_status->key_exchange_group) ||
!iter.ReadInt(&ssl_status->connection_status)) {
*ssl_status = SSLStatus();
return false;
@@ -119,12 +119,6 @@ bool DeserializeSecurityInfo(const std::string& state, SSLStatus* ssl_status) {
return false;
}
- // Sanity check |key_exchange_info|: 0 or greater.
- if (ssl_status->key_exchange_info < 0) {
- *ssl_status = SSLStatus();
- return false;
- }
-
return true;
}

Powered by Google App Engine
This is Rietveld 408576698