Replace key_exchange_info with key_exchange_group.

net/ssl/ssl_info.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "net/ssl/ssl_info.h"
 
 #include <openssl/ssl.h>
 
 #include "base/pickle.h"
 #include "net/cert/cert_status_flags.h"
@@ skipping 13 matching lines @@
 }
 
 SSLInfo::~SSLInfo() {
 }
 
 SSLInfo& SSLInfo::operator=(const SSLInfo& info) {
   cert = info.cert;
   unverified_cert = info.unverified_cert;
   cert_status = info.cert_status;
   security_bits = info.security_bits;
-  key_exchange_info = info.key_exchange_info;
+  key_exchange_group = info.key_exchange_group;
   connection_status = info.connection_status;
   is_issued_by_known_root = info.is_issued_by_known_root;
   pkp_bypassed = info.pkp_bypassed;
   client_cert_sent = info.client_cert_sent;
   channel_id_sent = info.channel_id_sent;
   token_binding_negotiated = info.token_binding_negotiated;
   token_binding_key_param = info.token_binding_key_param;
   handshake_type = info.handshake_type;
   public_key_hashes = info.public_key_hashes;
   pinning_failure_log = info.pinning_failure_log;
   signed_certificate_timestamps = info.signed_certificate_timestamps;
   ct_compliance_details_available = info.ct_compliance_details_available;
   ct_ev_policy_compliance = info.ct_ev_policy_compliance;
   ct_cert_policy_compliance = info.ct_cert_policy_compliance;
   ocsp_result = info.ocsp_result;
   return *this;
 }
 
 void SSLInfo::Reset() {
   cert = NULL;
   unverified_cert = NULL;
   cert_status = 0;
   security_bits = -1;
-  key_exchange_info = 0;
+  key_exchange_group = 0;
   connection_status = 0;
   is_issued_by_known_root = false;
   pkp_bypassed = false;
   client_cert_sent = false;
   channel_id_sent = false;
   token_binding_negotiated = false;
   token_binding_key_param = TB_PARAM_ECDSAP256;
   handshake_type = HANDSHAKE_UNKNOWN;
   public_key_hashes.clear();
   pinning_failure_log.clear();
   signed_certificate_timestamps.clear();
   ct_compliance_details_available = false;
   ct_ev_policy_compliance = ct::EVPolicyCompliance::EV_POLICY_DOES_NOT_APPLY;
   ct_cert_policy_compliance =
       ct::CertPolicyCompliance::CERT_POLICY_COMPLIES_VIA_SCTS;
   ocsp_result = OCSPVerifyResult();
 }
 
-uint16_t SSLInfo::GetKeyExchangeGroup() const {
-  // key_exchange_info is sometimes the (EC)DH group ID and sometimes a
-  // completely different value.
-  //
-  // TODO(davidben): Once the DHE removal has stuck, remove key_exchange_info
-  // from this struct, doing all necessary conversions when parsing out of
-  // legacy cache entries. At that point, this accessor may be replaced with the
-  // struct field. See https://crbug.com/639421.
-  //
-  // TODO(davidben): When TLS 1.3 draft 15's new negotiation is implemented,
-  // also report key_exchange_info for the new AEAD/PRF ciphers.
-  uint16_t cipher_value = SSLConnectionStatusToCipherSuite(connection_status);
-  const SSL_CIPHER* cipher = SSL_get_cipher_by_value(cipher_value);
-  if (cipher && SSL_CIPHER_is_ECDHE(cipher))
-    return static_cast<uint16_t>(key_exchange_info);
-  return 0;
-}
-
 void SSLInfo::SetCertError(int error) {
   cert_status |= MapNetErrorToCertStatus(error);
 }
 
 void SSLInfo::UpdateCertificateTransparencyInfo(
     const ct::CTVerifyResult& ct_verify_result) {
   signed_certificate_timestamps.insert(signed_certificate_timestamps.end(),
                                        ct_verify_result.scts.begin(),
                                        ct_verify_result.scts.end());
 
   ct_compliance_details_available = ct_verify_result.ct_policies_applied;
   ct_cert_policy_compliance = ct_verify_result.cert_policy_compliance;
   ct_ev_policy_compliance = ct_verify_result.ev_policy_compliance;
 }
 
 }  // namespace net