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

Side by Side Diff: chromeos/network/onc/onc_translator.h

Issue 16946002: Resolve certificate references in ONC by PEM. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fixed tests. Created 7 years, 6 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef CHROMEOS_NETWORK_ONC_ONC_TRANSLATOR_H_ 5 #ifndef CHROMEOS_NETWORK_ONC_ONC_TRANSLATOR_H_
6 #define CHROMEOS_NETWORK_ONC_ONC_TRANSLATOR_H_ 6 #define CHROMEOS_NETWORK_ONC_ONC_TRANSLATOR_H_
7 7
8 #include <string>
9
10 #include "base/callback.h"
8 #include "base/memory/scoped_ptr.h" 11 #include "base/memory/scoped_ptr.h"
9 #include "chromeos/chromeos_export.h" 12 #include "chromeos/chromeos_export.h"
10 13
11 namespace base { 14 namespace base {
12 class DictionaryValue; 15 class DictionaryValue;
13 } 16 }
14 17
15 namespace chromeos { 18 namespace chromeos {
16 namespace onc { 19 namespace onc {
17 20
18 struct OncValueSignature; 21 struct OncValueSignature;
19 22
23 // For a Server or CA certificate reference |fingerprint| (hexadecimal encoded
24 // SHA1 fingerprint), returns the PEM encoding of the certificate. Returns an
25 // empty string, if the reference cannot be resolved.
26 typedef base::Callback<std::string(const std::string& fingerprint)>
27 FingerprintToPEM;
28
20 // Translates a hierarchical ONC dictionary |onc_object| to a flat Shill 29 // Translates a hierarchical ONC dictionary |onc_object| to a flat Shill
21 // dictionary. The |signature| declares the type of |onc_object| and must point 30 // dictionary. The |signature| declares the type of |onc_object| and must point
22 // to one of the signature objects in "onc_signature.h". The resulting Shill 31 // to one of the signature objects in "onc_signature.h". The resulting Shill
23 // dictionary is returned. 32 // dictionary is returned.
24 // 33 //
25 // This function is used to translate network settings from ONC to Shill's 34 // This function is used to translate network settings from ONC to Shill's
26 // format before sending them to Shill. 35 // format before sending them to Shill.
27 CHROMEOS_EXPORT 36 CHROMEOS_EXPORT
28 scoped_ptr<base::DictionaryValue> TranslateONCObjectToShill( 37 scoped_ptr<base::DictionaryValue> TranslateONCObjectToShill(
29 const OncValueSignature* signature, 38 const OncValueSignature* signature,
30 const base::DictionaryValue& onc_object); 39 const base::DictionaryValue& onc_object,
40 const FingerprintToPEM& fingerprint_to_pem);
31 41
32 // Translates a |shill_dictionary| to an ONC object according to the given 42 // Translates a |shill_dictionary| to an ONC object according to the given
33 // |onc_signature|. |onc_signature| must point to a signature object in 43 // |onc_signature|. |onc_signature| must point to a signature object in
34 // "onc_signature.h". The resulting ONC object is returned. 44 // "onc_signature.h". The resulting ONC object is returned.
35 // 45 //
36 // This function is used to translate network settings coming from Shill to ONC 46 // This function is used to translate network settings coming from Shill to ONC
37 // before sending them to the UI. The result doesn't have to be valid ONC, but 47 // before sending them to the UI. The result doesn't have to be valid ONC, but
38 // only a subset of it and includes only the values that are actually required 48 // only a subset of it and includes only the values that are actually required
39 // by the UI. 49 // by the UI.
40 CHROMEOS_EXPORT 50 CHROMEOS_EXPORT
41 scoped_ptr<base::DictionaryValue> TranslateShillServiceToONCPart( 51 scoped_ptr<base::DictionaryValue> TranslateShillServiceToONCPart(
42 const base::DictionaryValue& shill_dictionary, 52 const base::DictionaryValue& shill_dictionary,
43 const OncValueSignature* onc_signature); 53 const OncValueSignature* onc_signature);
44 54
45 } // namespace onc 55 } // namespace onc
46 } // namespace chromeos 56 } // namespace chromeos
47 57
48 #endif // CHROMEOS_NETWORK_ONC_ONC_TRANSLATOR_H_ 58 #endif // CHROMEOS_NETWORK_ONC_ONC_TRANSLATOR_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698