diff options
author | mattwein <mattwein@chromium.org> | 2015-04-23 21:15:56 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2015-04-24 04:16:08 +0000 |
commit | b605e72e1b07f9b7501882c31ec422d05c1794bf (patch) | |
tree | 721b624ac1331c7aa9ad4b5cdb0853e6822da10e /chromeos | |
parent | d32919d3f8274b051f6d506fe002c6c43f5185e4 (diff) | |
download | chromium_src-b605e72e1b07f9b7501882c31ec422d05c1794bf.zip chromium_src-b605e72e1b07f9b7501882c31ec422d05c1794bf.tar.gz chromium_src-b605e72e1b07f9b7501882c31ec422d05c1794bf.tar.bz2 |
Add an ONC property for proactive key caching with documentation.
BUG=475699
TEST=None
Review URL: https://codereview.chromium.org/1085703002
Cr-Commit-Position: refs/heads/master@{#326738}
Diffstat (limited to 'chromeos')
5 files changed, 6 insertions, 0 deletions
diff --git a/chromeos/network/onc/onc_signature.cc b/chromeos/network/onc/onc_signature.cc index b84421d..e939c17 100644 --- a/chromeos/network/onc/onc_signature.cc +++ b/chromeos/network/onc/onc_signature.cc @@ -67,6 +67,7 @@ const OncFieldSignature eap_fields[] = { {::onc::eap::kServerCARef, &kStringSignature}, {::onc::eap::kServerCARefs, &kStringListSignature}, {::onc::eap::kUseSystemCAs, &kBoolSignature}, + {::onc::eap::kUseProactiveKeyCaching, &kBoolSignature}, {NULL}}; const OncFieldSignature ipsec_fields[] = { diff --git a/chromeos/network/onc/onc_translation_tables.cc b/chromeos/network/onc/onc_translation_tables.cc index 575fdef..d3d00a0 100644 --- a/chromeos/network/onc/onc_translation_tables.cc +++ b/chromeos/network/onc/onc_translation_tables.cc @@ -33,6 +33,8 @@ const FieldTranslationEntry eap_fields[] = { {::onc::eap::kSaveCredentials, shill::kSaveCredentialsProperty}, {::onc::eap::kServerCAPEMs, shill::kEapCaCertPemProperty}, {::onc::eap::kUseSystemCAs, shill::kEapUseSystemCasProperty}, + {::onc::eap::kUseProactiveKeyCaching, + shill::kEapUseProactiveKeyCachingProperty}, {NULL}}; const FieldTranslationEntry ipsec_fields[] = { diff --git a/chromeos/test/data/network/shill_wifi_clientcert.json b/chromeos/test/data/network/shill_wifi_clientcert.json index 2b90e7f..b3ff20f 100644 --- a/chromeos/test/data/network/shill_wifi_clientcert.json +++ b/chromeos/test/data/network/shill_wifi_clientcert.json @@ -1,6 +1,7 @@ { "EAP.EAP": "TLS", "EAP.Identity": "abc ${LOGIN_ID}@my.domain.com", + "EAP.UseProactiveKeyCaching": true, "EAP.UseSystemCAs": true, "GUID": "{77db0089-0bc8-4358-929c-123xcv}", "Mode": "managed", diff --git a/chromeos/test/data/network/translation_of_shill_wifi_clientcert.onc b/chromeos/test/data/network/translation_of_shill_wifi_clientcert.onc index 7a32530..52dd992 100644 --- a/chromeos/test/data/network/translation_of_shill_wifi_clientcert.onc +++ b/chromeos/test/data/network/translation_of_shill_wifi_clientcert.onc @@ -6,6 +6,7 @@ "EAP": { "Identity": "abc ${LOGIN_ID}@my.domain.com", "SaveCredentials": true, + "UseProactiveKeyCaching": true, "UseSystemCAs": true }, "HexSSID":"4F70656E577274", // "OpenWrt" diff --git a/chromeos/test/data/network/wifi_clientcert_with_cert_pems.onc b/chromeos/test/data/network/wifi_clientcert_with_cert_pems.onc index 7e31b61..6e2f47b 100644 --- a/chromeos/test/data/network/wifi_clientcert_with_cert_pems.onc +++ b/chromeos/test/data/network/wifi_clientcert_with_cert_pems.onc @@ -9,6 +9,7 @@ "EAP": { "Outer": "EAP-TLS", "Identity": "abc ${LOGIN_ID}@my.domain.com", + "UseProactiveKeyCaching": true, "UseSystemCAs": true, "ClientCertType": "Pattern", "ClientCertPattern": { |