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}

8 files changed, 18 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": {
diff --git a/components/onc/docs/onc_spec.html b/components/onc/docs/onc_spec.html
index e791588..d3f9a92 100644
--- a/components/onc/docs/onc_spec.html
+++ b/components/onc/docs/onc_spec.html
@@ -2049,6 +2049,16 @@
       is <span class="value">false</span>, and no <span class="field">ServerCARef</span> is set, the certificate
       must be a self signed certificate, and no CA signature is required.
     </dd>
+
+    <dt class="field">UseProactiveKeyCaching</dt>
+    <dd>
+      <span class="field_meta">
+        (optional, defaults to <span class="value">false</span>)
+        <span class="type">boolean</span>
+      </span>
+      Indicates whether Proactive Key Caching (also known as Opportunistic
+      Key Caching) should be used on a per-service basis.
+    </dd>
   </dl>
 
   <p class="rule">
diff --git a/components/onc/onc_constants.cc b/components/onc/onc_constants.cc
index 3007ac5..a1cfb24 100644
--- a/components/onc/onc_constants.cc
+++ b/components/onc/onc_constants.cc
@@ -293,6 +293,7 @@ const char kServerCAPEMs[] = "ServerCAPEMs";
 const char kServerCARef[] = "ServerCARef";
 const char kServerCARefs[] = "ServerCARefs";
 const char kUseSystemCAs[] = "UseSystemCAs";
+const char kUseProactiveKeyCaching[] = "UseProactiveKeyCaching";
 }  // namespace eap
 
 namespace vpn {
diff --git a/components/onc/onc_constants.h b/components/onc/onc_constants.h
index 2ed2434..a28ec83 100644
--- a/components/onc/onc_constants.h
+++ b/components/onc/onc_constants.h
@@ -311,6 +311,7 @@ ONC_EXPORT extern const char kServerCAPEMs[];
 ONC_EXPORT extern const char kServerCARef[];
 ONC_EXPORT extern const char kServerCARefs[];
 ONC_EXPORT extern const char kUseSystemCAs[];
+ONC_EXPORT extern const char kUseProactiveKeyCaching[];
 }  // namespace eap
 
 namespace vpn {