summaryrefslogtreecommitdiffstats
path: root/chromeos
diff options
context:
space:
mode:
Diffstat (limited to 'chromeos')
-rw-r--r--chromeos/network/onc/onc_signature.cc1
-rw-r--r--chromeos/network/onc/onc_translation_tables.cc2
-rw-r--r--chromeos/test/data/network/shill_wifi_clientcert.json1
-rw-r--r--chromeos/test/data/network/translation_of_shill_wifi_clientcert.onc1
-rw-r--r--chromeos/test/data/network/wifi_clientcert_with_cert_pems.onc1
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": {