diff options
| author | pstew <pstew@chromium.org> | 2015-05-11 17:18:13 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-05-12 00:18:31 +0000 |
| commit | eba91db036f740777ff8503cc2cc2597e8525353 (patch) | |
| tree | df0b5eb70128bc377e22d5b22d8de418bb3e05fa | |
| parent | 0ff62a54f76daa61a292ee4e599efdaea88ff3d0 (diff) | |
| download | chromium_src-eba91db036f740777ff8503cc2cc2597e8525353.zip chromium_src-eba91db036f740777ff8503cc2cc2597e8525353.tar.gz chromium_src-eba91db036f740777ff8503cc2cc2597e8525353.tar.bz2 | |
Add ONC property for EAP-GTC authentication
BUG=486738
R=stevenjb@chromium.org, pneubeck@chromium.org
Review URL: https://codereview.chromium.org/1137633003
Cr-Commit-Position: refs/heads/master@{#329291}
| -rw-r--r-- | chromeos/network/onc/onc_translation_tables.cc | 2 | ||||
| -rw-r--r-- | chromeos/network/onc/onc_validator.cc | 3 | ||||
| -rw-r--r-- | components/onc/docs/onc_spec.html | 4 | ||||
| -rw-r--r-- | components/onc/onc_constants.cc | 1 | ||||
| -rw-r--r-- | components/onc/onc_constants.h | 1 |
5 files changed, 8 insertions, 3 deletions
diff --git a/chromeos/network/onc/onc_translation_tables.cc b/chromeos/network/onc/onc_translation_tables.cc index d3d00a0..40e0cd1 100644 --- a/chromeos/network/onc/onc_translation_tables.cc +++ b/chromeos/network/onc/onc_translation_tables.cc @@ -311,6 +311,7 @@ const StringTranslationEntry kEAPOuterTable[] = { const StringTranslationEntry kEAP_PEAP_InnerTable[] = { {::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 @@ -318,6 +319,7 @@ const StringTranslationEntry kEAP_TTLS_InnerTable[] = { {::onc::eap::kMD5, shill::kEapPhase2AuthTTLSMD5}, {::onc::eap::kMSCHAPv2, shill::kEapPhase2AuthTTLSMSCHAPV2}, {::onc::eap::kPAP, shill::kEapPhase2AuthTTLSPAP}, + {::onc::eap::kGTC, shill::kEapPhase2AuthTTLSGTC}, {NULL}}; const StringTranslationEntry kActivationStateTable[] = { diff --git a/chromeos/network/onc/onc_validator.cc b/chromeos/network/onc/onc_validator.cc index e3ea49a..4e2e732 100644 --- a/chromeos/network/onc/onc_validator.cc +++ b/chromeos/network/onc/onc_validator.cc @@ -880,7 +880,8 @@ bool Validator::ValidateProxyLocation(base::DictionaryValue* result) { bool Validator::ValidateEAP(base::DictionaryValue* result) { using namespace ::onc::eap; - const char* const kValidInnerValues[] = {kAutomatic, kMD5, kMSCHAPv2, kPAP}; + const char* const kValidInnerValues[] = { + kAutomatic, kGTC, kMD5, kMSCHAPv2, kPAP}; const std::vector<const char*> valid_inner_values( toVector(kValidInnerValues)); const char* const kValidOuterValues[] = { diff --git a/components/onc/docs/onc_spec.html b/components/onc/docs/onc_spec.html index d3f9a92..56caf14 100644 --- a/components/onc/docs/onc_spec.html +++ b/components/onc/docs/onc_spec.html @@ -1973,8 +1973,8 @@ <span class="rule_id"></span> Allowed values are <span class="value">Automatic</span>, <span class="value">MD5</span>, <span class="value">MSCHAPv2</span>, - <span class="value">EAP-MSCHAPv2</span>, and - <span class="value">PAP</span>. + <span class="value">EAP-MSCHAPv2</span>, + <span class="value">PAP</span>, and <span class="value">GTC</span>. </span> For tunneling outer protocols. </dd> diff --git a/components/onc/onc_constants.cc b/components/onc/onc_constants.cc index a1cfb24..bb5d61e 100644 --- a/components/onc/onc_constants.cc +++ b/components/onc/onc_constants.cc @@ -279,6 +279,7 @@ const char kEAP_FAST[] = "EAP-FAST"; const char kEAP_SIM[] = "EAP-SIM"; const char kEAP_TLS[] = "EAP-TLS"; const char kEAP_TTLS[] = "EAP-TTLS"; +const char kGTC[] = "GTC"; const char kIdentity[] = "Identity"; const char kInner[] = "Inner"; const char kLEAP[] = "LEAP"; diff --git a/components/onc/onc_constants.h b/components/onc/onc_constants.h index a28ec83..b212d31 100644 --- a/components/onc/onc_constants.h +++ b/components/onc/onc_constants.h @@ -297,6 +297,7 @@ ONC_EXPORT extern const char kEAP_FAST[]; ONC_EXPORT extern const char kEAP_SIM[]; ONC_EXPORT extern const char kEAP_TLS[]; ONC_EXPORT extern const char kEAP_TTLS[]; +ONC_EXPORT extern const char kGTC[]; ONC_EXPORT extern const char kIdentity[]; ONC_EXPORT extern const char kInner[]; ONC_EXPORT extern const char kLEAP[]; |