Resolve certificate references in ONC by PEM.

chrome/browser/chromeos/options/wifi_config_view.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 "chrome/browser/chromeos/options/wifi_config_view.h"
 
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/chromeos/cros/cros_library.h"
@@ skipping 663 matching lines @@
           security,
           GetPassphrase(),
           NULL,
           GetSaveCredentials(),
           GetShareNetwork(share_default));
     } else {
       // Hidden 802.1X EAP Wi-Fi connection.
       chromeos::NetworkLibrary::EAPConfigData config_data;
       config_data.method = GetEapMethod();
       config_data.auth = GetEapPhase2Auth();
-      config_data.server_ca_cert_nss_nickname = GetEapServerCaCertNssNickname();
+      config_data.server_ca_cert_pem = GetEapServerCaCertPEM();
       config_data.use_system_cas = GetEapUseSystemCas();
       config_data.client_cert_pkcs11_id = GetEapClientCertPkcs11Id();
       config_data.identity = GetEapIdentity();
       config_data.anonymous_identity = GetEapAnonymousIdentity();
       cros->ConnectToUnconfiguredWifiNetwork(
           GetSsid(),
           SECURITY_8021X,
           GetPassphrase(),
           &config_data,
           GetSaveCredentials(),
           GetShareNetwork(share_default));
     }
   } else {
     WifiNetwork* wifi = cros->FindWifiNetworkByPath(service_path_);
     if (!wifi) {
       // Shill no longer knows about this wifi network (edge case).
       // TODO(stevenjb): Add a notification (chromium-os13225).
       LOG(WARNING) << "Wifi network: " << service_path_ << " no longer exists.";
       return true;
     }
     if (eap_method_combobox_) {
       // Visible 802.1X EAP Wi-Fi connection.
       EAPMethod method = GetEapMethod();
       DCHECK(method != EAP_METHOD_UNKNOWN);
       wifi->SetEAPMethod(method);
       wifi->SetEAPPhase2Auth(GetEapPhase2Auth());
-      wifi->SetEAPServerCaCertNssNickname(GetEapServerCaCertNssNickname());
+      wifi->SetEAPServerCaCertPEM(GetEapServerCaCertPEM());
       wifi->SetEAPUseSystemCAs(GetEapUseSystemCas());
       wifi->SetEAPClientCertPkcs11Id(GetEapClientCertPkcs11Id());
       wifi->SetEAPIdentity(GetEapIdentity());
       wifi->SetEAPAnonymousIdentity(GetEapAnonymousIdentity());
       wifi->SetEAPPassphrase(GetPassphrase());
       wifi->SetSaveCredentials(GetSaveCredentials());
     } else {
       // Visible ordinary Wi-Fi connection.
       const std::string passphrase = GetPassphrase();
       if (passphrase != wifi->passphrase())
@@ skipping 70 matching lines @@
       return EAP_PHASE_2_AUTH_MSCHAP;
     case PHASE_2_AUTH_INDEX_PAP:
       return EAP_PHASE_2_AUTH_PAP;
     case PHASE_2_AUTH_INDEX_CHAP:
       return EAP_PHASE_2_AUTH_CHAP;
     default:
       return EAP_PHASE_2_AUTH_AUTO;
   }
 }
 
-std::string WifiConfigView::GetEapServerCaCertNssNickname() const {
+std::string WifiConfigView::GetEapServerCaCertPEM() const {
   DCHECK(server_ca_cert_combobox_);
   int index = server_ca_cert_combobox_->selected_index();
   if (index == 0) {
     // First item is "Default".
     return std::string();
   } else if (index == server_ca_cert_combobox_->model()->GetItemCount() - 1) {
     // Last item is "Do not check".
     return std::string();
   } else {
     int cert_index = index - 1;
-    return CertLibrary::Get()->GetCertNicknameAt(
+    return CertLibrary::Get()->GetCertPEMAt(
         CertLibrary::CERT_TYPE_SERVER_CA, cert_index);
   }
 }
 
 bool WifiConfigView::GetEapUseSystemCas() const {
   DCHECK(server_ca_cert_combobox_);
   // Only use system CAs if the first item ("Default") is selected.
   return server_ca_cert_combobox_->selected_index() == 0;
 }
 
@@ skipping 349 matching lines @@
       }
 
       const std::string& eap_anonymous_identity =
           (wifi ? wifi->eap_anonymous_identity() : std::string());
       identity_anonymous_textfield_->SetText(
           UTF8ToUTF16(eap_anonymous_identity));
     }
 
     // Server CA certificate.
     if (CaCertActive()) {
-      const std::string& nss_nickname =
-          (wifi ? wifi->eap_server_ca_cert_nss_nickname() : std::string());
-      if (nss_nickname.empty()) {
+      const std::string& ca_cert_pem =
+          (wifi ? wifi->eap_server_ca_cert_pem() : std::string());
+      if (ca_cert_pem.empty()) {
         if (wifi->eap_use_system_cas()) {
           // "Default".
           server_ca_cert_combobox_->SetSelectedIndex(0);
         } else {
           // "Do not check".
           server_ca_cert_combobox_->SetSelectedIndex(
               server_ca_cert_combobox_->model()->GetItemCount() - 1);
         }
       } else {
         // Select the certificate if available.
-        int cert_index = CertLibrary::Get()->GetCertIndexByNickname(
-            CertLibrary::CERT_TYPE_SERVER_CA, nss_nickname);
+        int cert_index = CertLibrary::Get()->GetCertIndexByPEM(
+            CertLibrary::CERT_TYPE_SERVER_CA, ca_cert_pem);
         if (cert_index >= 0) {
           // Skip item for "Default".
           server_ca_cert_combobox_->SetSelectedIndex(1 + cert_index);
         }
       }
     }
 
     // User certificate.
     if (UserCertActive()) {
       const std::string& pkcs11_id =
@@ skipping 50 matching lines @@
 void WifiConfigView::ParseWiFiEAPUIProperty(
     NetworkPropertyUIData* property_ui_data,
     Network* network,
     const std::string& key) {
   ParseWiFiUIProperty(
       property_ui_data, network,
       base::StringPrintf("%s.%s", onc::wifi::kEAP, key.c_str()));
 }
 
 }  // namespace chromeos