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

Unified Diff: chromeos/network/onc/onc_translation_tables.cc

Issue 2853563002: ONC: Translate EAP from Shill to ONC (Closed)
Patch Set: Test for empty EAP field and cl format Created 3 years, 8 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 side-by-side diff with in-line comments
Download patch
Index: chromeos/network/onc/onc_translation_tables.cc
diff --git a/chromeos/network/onc/onc_translation_tables.cc b/chromeos/network/onc/onc_translation_tables.cc
index 51fa269c38e44d0a3b6d49466e062d8f7bf37354..0da382a6086145118c93680fc224820a8befe55d 100644
--- a/chromeos/network/onc/onc_translation_tables.cc
+++ b/chromeos/network/onc/onc_translation_tables.cc
@@ -31,6 +31,7 @@ const FieldTranslationEntry eap_fields[] = {
{::onc::eap::kPassword, shill::kEapPasswordProperty},
{::onc::eap::kSaveCredentials, shill::kSaveCredentialsProperty},
{::onc::eap::kServerCAPEMs, shill::kEapCaCertPemProperty},
+ {::onc::eap::kSubjectMatch, shill::kEapSubjectMatchProperty},
{::onc::eap::kUseSystemCAs, shill::kEapUseSystemCasProperty},
{::onc::eap::kUseProactiveKeyCaching,
shill::kEapUseProactiveKeyCachingProperty},
@@ -318,17 +319,18 @@ const StringTranslationEntry kEAPOuterTable[] = {
// Translation of the EAP.Inner field in case of EAP.Outer == PEAP
const StringTranslationEntry kEAP_PEAP_InnerTable[] = {
+ {::onc::eap::kGTC, shill::kEapPhase2AuthPEAPGTC},
{::onc::eap::kMD5, shill::kEapPhase2AuthPEAPMD5},
{::onc::eap::kMSCHAPv2, shill::kEapPhase2AuthPEAPMSCHAPV2},
- {::onc::eap::kGTC, shill::kEapPhase2AuthPEAPGTC},
{NULL}};
// Translation of the EAP.Inner field in case of EAP.Outer == TTLS
const StringTranslationEntry kEAP_TTLS_InnerTable[] = {
+ {::onc::eap::kGTC, shill::kEapPhase2AuthTTLSGTC},
{::onc::eap::kMD5, shill::kEapPhase2AuthTTLSMD5},
+ {::onc::eap::kMSCHAP, shill::kEapPhase2AuthTTLSMSCHAP},
{::onc::eap::kMSCHAPv2, shill::kEapPhase2AuthTTLSMSCHAPV2},
{::onc::eap::kPAP, shill::kEapPhase2AuthTTLSPAP},
- {::onc::eap::kGTC, shill::kEapPhase2AuthTTLSGTC},
{NULL}};
const StringTranslationEntry kActivationStateTable[] = {

Powered by Google App Engine
This is Rietveld 408576698