Add migration from CaCert NSS nicknames to PEM.

chromeos/network/network_state.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 "chromeos/network/network_state.h"
 
 #include "base/i18n/icu_encoding_detection.h"
 #include "base/i18n/icu_string_conversions.h"
 #include "base/json/json_writer.h"
 #include "base/strings/string_number_conversions.h"
@@ skipping 48 matching lines @@
     : ManagedState(MANAGED_TYPE_NETWORK, path),
       auto_connect_(false),
       favorite_(false),
       priority_(0),
       onc_source_(onc::ONC_SOURCE_NONE),
       prefix_length_(0),
       signal_strength_(0),
       connectable_(false),
       passphrase_required_(false),
       activate_over_non_cellular_networks_(false),
-      cellular_out_of_credits_(false) {
+      cellular_out_of_credits_(false),
+      has_eap_ca_cert_nss_(false),
+      has_ipsec_ca_cert_nss_(false),
+      has_openvpn_ca_cert_nss_(false) {
 }
 
 NetworkState::~NetworkState() {
 }
 
 bool NetworkState::PropertyChanged(const std::string& key,
                                    const base::Value& value) {
   // Keep care that these properties are the same as in |GetProperties|.
   if (ManagedStatePropertyChanged(key, value))
     return true;
@@ skipping 110 matching lines @@
     }
     return true;
   } else if (key == flimflam::kWifiHexSsid) {
     return GetStringValue(key, value, &hex_ssid_);
   } else if (key == flimflam::kCountryProperty) {
     // TODO(stevenjb): This is currently experimental. If we find a case where
     // base::DetectEncoding() fails in UpdateName(), where country_code_ is
     // set, figure out whether we can use country_code_ with ConvertToUtf8().
     // crbug.com/233267.
     return GetStringValue(key, value, &country_code_);
+  } else if (key == flimflam::kEapCaCertNssProperty) {
+    std::string ca_cert_nss;
+    if (!value.GetAsString(&ca_cert_nss)) {
+      NET_LOG_ERROR("Failed to parse " + key, path());
+      return false;
+    }
+    has_eap_ca_cert_nss_ = !ca_cert_nss.empty();
+    return true;
+  } else if (key == flimflam::kL2tpIpsecCaCertNssProperty) {
+    std::string ca_cert_nss;
+    if (!value.GetAsString(&ca_cert_nss)) {
+      NET_LOG_ERROR("Failed to parse " + key, path());
+      return false;
+    }
+    has_ipsec_ca_cert_nss_ = !ca_cert_nss.empty();
+    return true;
+  } else if (key == flimflam::kProviderProperty) {
+    const DictionaryValue* dict = NULL;
+    value.GetAsDictionary(&dict);
+    if (!dict) {
+      NET_LOG_ERROR("Failed to parse " + key, path());
+      return false;
+    }
+
+    std::string ca_cert_nss;
+    dict->GetStringWithoutPathExpansion(flimflam::kOpenVPNCaCertNSSProperty,
+                                        &ca_cert_nss);
+    has_openvpn_ca_cert_nss_ = !ca_cert_nss.empty();
+    return true;

[stevenjb, 2013/07/29 17:53:03]

For the connect code I added the complete properties DictionaryValue as a
parameter ti InitialPropertiesReceived(). Rather than storing 3 separate
booleans here, we should parse these properties there and set a single boolean. 

I will upload a CL with that change separately.

[pneubeck (no reviews), 2013/08/05 08:51:22]

Done.

   }
   return false;
 }
 
 void NetworkState::InitialPropertiesReceived() {
   UpdateName();
 }
 
 void NetworkState::GetProperties(base::DictionaryValue* dictionary) const {
   // Keep care that these properties are the same as in |PropertyChanged|.
@@ skipping 220 matching lines @@
   }
   scoped_ptr<base::DictionaryValue> ui_data_dict(
       onc::ReadDictionaryFromJson(ui_data_str));
   if (!ui_data_dict)
     return false;
   *out = NetworkUIData(*ui_data_dict).onc_source();
   return true;
 }
 
 }  // namespace chromeos