Commit b605e72e authored by mattwein's avatar mattwein Committed by Commit bot

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}
parent d32919d3
...@@ -67,6 +67,7 @@ const OncFieldSignature eap_fields[] = { ...@@ -67,6 +67,7 @@ const OncFieldSignature eap_fields[] = {
{::onc::eap::kServerCARef, &kStringSignature}, {::onc::eap::kServerCARef, &kStringSignature},
{::onc::eap::kServerCARefs, &kStringListSignature}, {::onc::eap::kServerCARefs, &kStringListSignature},
{::onc::eap::kUseSystemCAs, &kBoolSignature}, {::onc::eap::kUseSystemCAs, &kBoolSignature},
{::onc::eap::kUseProactiveKeyCaching, &kBoolSignature},
{NULL}}; {NULL}};
const OncFieldSignature ipsec_fields[] = { const OncFieldSignature ipsec_fields[] = {
......
...@@ -33,6 +33,8 @@ const FieldTranslationEntry eap_fields[] = { ...@@ -33,6 +33,8 @@ const FieldTranslationEntry eap_fields[] = {
{::onc::eap::kSaveCredentials, shill::kSaveCredentialsProperty}, {::onc::eap::kSaveCredentials, shill::kSaveCredentialsProperty},
{::onc::eap::kServerCAPEMs, shill::kEapCaCertPemProperty}, {::onc::eap::kServerCAPEMs, shill::kEapCaCertPemProperty},
{::onc::eap::kUseSystemCAs, shill::kEapUseSystemCasProperty}, {::onc::eap::kUseSystemCAs, shill::kEapUseSystemCasProperty},
{::onc::eap::kUseProactiveKeyCaching,
shill::kEapUseProactiveKeyCachingProperty},
{NULL}}; {NULL}};
const FieldTranslationEntry ipsec_fields[] = { const FieldTranslationEntry ipsec_fields[] = {
......
{ {
"EAP.EAP": "TLS", "EAP.EAP": "TLS",
"EAP.Identity": "abc ${LOGIN_ID}@my.domain.com", "EAP.Identity": "abc ${LOGIN_ID}@my.domain.com",
"EAP.UseProactiveKeyCaching": true,
"EAP.UseSystemCAs": true, "EAP.UseSystemCAs": true,
"GUID": "{77db0089-0bc8-4358-929c-123xcv}", "GUID": "{77db0089-0bc8-4358-929c-123xcv}",
"Mode": "managed", "Mode": "managed",
......
...@@ -6,6 +6,7 @@ ...@@ -6,6 +6,7 @@
"EAP": { "EAP": {
"Identity": "abc ${LOGIN_ID}@my.domain.com", "Identity": "abc ${LOGIN_ID}@my.domain.com",
"SaveCredentials": true, "SaveCredentials": true,
"UseProactiveKeyCaching": true,
"UseSystemCAs": true "UseSystemCAs": true
}, },
"HexSSID":"4F70656E577274", // "OpenWrt" "HexSSID":"4F70656E577274", // "OpenWrt"
......
...@@ -9,6 +9,7 @@ ...@@ -9,6 +9,7 @@
"EAP": { "EAP": {
"Outer": "EAP-TLS", "Outer": "EAP-TLS",
"Identity": "abc ${LOGIN_ID}@my.domain.com", "Identity": "abc ${LOGIN_ID}@my.domain.com",
"UseProactiveKeyCaching": true,
"UseSystemCAs": true, "UseSystemCAs": true,
"ClientCertType": "Pattern", "ClientCertType": "Pattern",
"ClientCertPattern": { "ClientCertPattern": {
......
...@@ -2049,6 +2049,16 @@ ...@@ -2049,6 +2049,16 @@
is <span class="value">false</span>, and no <span class="field">ServerCARef</span> is set, the certificate 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. must be a self signed certificate, and no CA signature is required.
</dd> </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> </dl>
<p class="rule"> <p class="rule">
......
...@@ -293,6 +293,7 @@ const char kServerCAPEMs[] = "ServerCAPEMs"; ...@@ -293,6 +293,7 @@ const char kServerCAPEMs[] = "ServerCAPEMs";
const char kServerCARef[] = "ServerCARef"; const char kServerCARef[] = "ServerCARef";
const char kServerCARefs[] = "ServerCARefs"; const char kServerCARefs[] = "ServerCARefs";
const char kUseSystemCAs[] = "UseSystemCAs"; const char kUseSystemCAs[] = "UseSystemCAs";
const char kUseProactiveKeyCaching[] = "UseProactiveKeyCaching";
} // namespace eap } // namespace eap
namespace vpn { namespace vpn {
......
...@@ -311,6 +311,7 @@ ONC_EXPORT extern const char kServerCAPEMs[]; ...@@ -311,6 +311,7 @@ ONC_EXPORT extern const char kServerCAPEMs[];
ONC_EXPORT extern const char kServerCARef[]; ONC_EXPORT extern const char kServerCARef[];
ONC_EXPORT extern const char kServerCARefs[]; ONC_EXPORT extern const char kServerCARefs[];
ONC_EXPORT extern const char kUseSystemCAs[]; ONC_EXPORT extern const char kUseSystemCAs[];
ONC_EXPORT extern const char kUseProactiveKeyCaching[];
} // namespace eap } // namespace eap
namespace vpn { namespace vpn {
......
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