Move PEM certificate decoding to onc_utils.

chromeos/network/onc/onc_utils.h

 // 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.
 
 #ifndef CHROMEOS_NETWORK_ONC_ONC_UTILS_H_
 #define CHROMEOS_NETWORK_ONC_ONC_UTILS_H_
 
 #include <string>
 
 #include "base/basictypes.h"
+#include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "chromeos/chromeos_export.h"
 #include "chromeos/network/onc/onc_constants.h"
+#include "net/cert/x509_certificate.h"
 
 namespace base {
 class DictionaryValue;
 class ListValue;
 }
 
 namespace chromeos {
 namespace onc {
 
 struct OncValueSignature;
@@ skipping 18 matching lines @@
 // For logging only: strings not user facing.
 CHROMEOS_EXPORT std::string GetSourceAsString(ONCSource source);
 
 // Used for string expansion with function ExpandStringInOncObject(...).
 class CHROMEOS_EXPORT StringSubstitution {
  public:
   StringSubstitution() {}
   virtual ~StringSubstitution() {}
 
   // Returns the replacement string for |placeholder| in
-  // |substitute|. Currently, onc::substitutes::kLoginIDField and
-  // onc::substitutes::kEmailField are supported.
+  // |substitute|. Currently, substitutes::kLoginIDField and
+  // substitutes::kEmailField are supported.
   virtual bool GetSubstitute(std::string placeholder,
                              std::string* substitute) const = 0;
  private:
   DISALLOW_COPY_AND_ASSIGN(StringSubstitution);
 };
 
 // Replaces all expandable fields that are mentioned in the ONC
 // specification. The object of |onc_object| is modified in place. Currently
-// onc::substitutes::kLoginIDField and onc::substitutes::kEmailField are
-// expanded. The replacement strings are obtained from |substitution|.
+// substitutes::kLoginIDField and substitutes::kEmailField are expanded. The
+// replacement strings are obtained from |substitution|.
 CHROMEOS_EXPORT void ExpandStringsInOncObject(
     const OncValueSignature& signature,
     const StringSubstitution& substitution,
     base::DictionaryValue* onc_object);
 
 // Creates a copy of |onc_object| with all values of sensitive fields replaced
 // by |mask|. To find sensitive fields, signature and field name are checked
 // with the function FieldIsCredential().
 CHROMEOS_EXPORT scoped_ptr<base::DictionaryValue> MaskCredentialsInOncObject(
     const OncValueSignature& signature,
     const base::DictionaryValue& onc_object,
     const std::string& mask);
 
 // Decrypts |onc_blob| with |passphrase| if necessary. Clears |network_configs|
 // and |certificates| and fills them with the validated NetworkConfigurations
 // and Certificates of |onc_blob|. Returns false if any validation errors or
 // warnings occurred. Still, some networks or certificates might be added to the
 // output lists and should be further processed by the caller.
 CHROMEOS_EXPORT bool ParseAndValidateOncForImport(
     const std::string& onc_blob,
-    chromeos::onc::ONCSource onc_source,
+    ONCSource onc_source,
     const std::string& passphrase,
     base::ListValue* network_configs,
     base::ListValue* certificates);
 
+// Parse the given PEM encoded certificate |pem_encoded| and create a
+// X509Certificate from it.
+CHROMEOS_EXPORT scoped_refptr<net::X509Certificate> GetCertFromPEMEncoding(

[Mattias Nissler (ping if slow), 2013/06/20 16:15:36]

nit: Maybe DecodePEMCertificate would be a more accurate name? Your call.

[pneubeck (no reviews), 2013/06/21 11:28:00]

Done.

+    const std::string& pem_encoded,
+    const std::string& nickname);
+
 }  // namespace onc
 }  // namespace chromeos
 
 #endif  // CHROMEOS_NETWORK_ONC_ONC_UTILS_H_