Commit eba91db0 authored by pstew's avatar pstew Committed by Commit bot

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}
parent 0ff62a54
...@@ -311,6 +311,7 @@ const StringTranslationEntry kEAPOuterTable[] = { ...@@ -311,6 +311,7 @@ const StringTranslationEntry kEAPOuterTable[] = {
const StringTranslationEntry kEAP_PEAP_InnerTable[] = { const StringTranslationEntry kEAP_PEAP_InnerTable[] = {
{::onc::eap::kMD5, shill::kEapPhase2AuthPEAPMD5}, {::onc::eap::kMD5, shill::kEapPhase2AuthPEAPMD5},
{::onc::eap::kMSCHAPv2, shill::kEapPhase2AuthPEAPMSCHAPV2}, {::onc::eap::kMSCHAPv2, shill::kEapPhase2AuthPEAPMSCHAPV2},
{::onc::eap::kGTC, shill::kEapPhase2AuthPEAPGTC},
{NULL}}; {NULL}};
// Translation of the EAP.Inner field in case of EAP.Outer == TTLS // Translation of the EAP.Inner field in case of EAP.Outer == TTLS
...@@ -318,6 +319,7 @@ const StringTranslationEntry kEAP_TTLS_InnerTable[] = { ...@@ -318,6 +319,7 @@ const StringTranslationEntry kEAP_TTLS_InnerTable[] = {
{::onc::eap::kMD5, shill::kEapPhase2AuthTTLSMD5}, {::onc::eap::kMD5, shill::kEapPhase2AuthTTLSMD5},
{::onc::eap::kMSCHAPv2, shill::kEapPhase2AuthTTLSMSCHAPV2}, {::onc::eap::kMSCHAPv2, shill::kEapPhase2AuthTTLSMSCHAPV2},
{::onc::eap::kPAP, shill::kEapPhase2AuthTTLSPAP}, {::onc::eap::kPAP, shill::kEapPhase2AuthTTLSPAP},
{::onc::eap::kGTC, shill::kEapPhase2AuthTTLSGTC},
{NULL}}; {NULL}};
const StringTranslationEntry kActivationStateTable[] = { const StringTranslationEntry kActivationStateTable[] = {
......
...@@ -880,7 +880,8 @@ bool Validator::ValidateProxyLocation(base::DictionaryValue* result) { ...@@ -880,7 +880,8 @@ bool Validator::ValidateProxyLocation(base::DictionaryValue* result) {
bool Validator::ValidateEAP(base::DictionaryValue* result) { bool Validator::ValidateEAP(base::DictionaryValue* result) {
using namespace ::onc::eap; 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( const std::vector<const char*> valid_inner_values(
toVector(kValidInnerValues)); toVector(kValidInnerValues));
const char* const kValidOuterValues[] = { const char* const kValidOuterValues[] = {
......
...@@ -1973,8 +1973,8 @@ ...@@ -1973,8 +1973,8 @@
<span class="rule_id"></span> <span class="rule_id"></span>
Allowed values are <span class="value">Automatic</span>, Allowed values are <span class="value">Automatic</span>,
<span class="value">MD5</span>, <span class="value">MSCHAPv2</span>, <span class="value">MD5</span>, <span class="value">MSCHAPv2</span>,
<span class="value">EAP-MSCHAPv2</span>, and <span class="value">EAP-MSCHAPv2</span>,
<span class="value">PAP</span>. <span class="value">PAP</span>, and <span class="value">GTC</span>.
</span> </span>
For tunneling outer protocols. For tunneling outer protocols.
</dd> </dd>
......
...@@ -279,6 +279,7 @@ const char kEAP_FAST[] = "EAP-FAST"; ...@@ -279,6 +279,7 @@ const char kEAP_FAST[] = "EAP-FAST";
const char kEAP_SIM[] = "EAP-SIM"; const char kEAP_SIM[] = "EAP-SIM";
const char kEAP_TLS[] = "EAP-TLS"; const char kEAP_TLS[] = "EAP-TLS";
const char kEAP_TTLS[] = "EAP-TTLS"; const char kEAP_TTLS[] = "EAP-TTLS";
const char kGTC[] = "GTC";
const char kIdentity[] = "Identity"; const char kIdentity[] = "Identity";
const char kInner[] = "Inner"; const char kInner[] = "Inner";
const char kLEAP[] = "LEAP"; const char kLEAP[] = "LEAP";
......
...@@ -297,6 +297,7 @@ ONC_EXPORT extern const char kEAP_FAST[]; ...@@ -297,6 +297,7 @@ ONC_EXPORT extern const char kEAP_FAST[];
ONC_EXPORT extern const char kEAP_SIM[]; ONC_EXPORT extern const char kEAP_SIM[];
ONC_EXPORT extern const char kEAP_TLS[]; ONC_EXPORT extern const char kEAP_TLS[];
ONC_EXPORT extern const char kEAP_TTLS[]; ONC_EXPORT extern const char kEAP_TTLS[];
ONC_EXPORT extern const char kGTC[];
ONC_EXPORT extern const char kIdentity[]; ONC_EXPORT extern const char kIdentity[];
ONC_EXPORT extern const char kInner[]; ONC_EXPORT extern const char kInner[];
ONC_EXPORT extern const char kLEAP[]; ONC_EXPORT extern const char kLEAP[];
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment