chrome/test/data/chromeos/net/shill_for_managed_toplevel2.json - Issue 16946002: Resolve certificate references in ONC by PEM.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/test/data/chromeos/net/shill_for_managed_toplevel2.json

Issue 16946002: Resolve certificate references in ONC by PEM. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Support CACert PEM list for L2tp. Created 7 years, 6 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« chrome/browser/chromeos/cros/network_library.h ('K') | « chrome/test/data/chromeos/net/shill_for_managed_toplevel1.json ('k') | chrome/test/data/chromeos/net/shill_for_toplevel_openvpn_clientcert.json » ('j') | chromeos/network/onc/onc_constants.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/test/data/chromeos/net/shill_for_managed_toplevel2.json

diff --git a/chrome/test/data/chromeos/net/shill_for_managed_toplevel2.json b/chrome/test/data/chromeos/net/shill_for_managed_toplevel2.json

index f37e67ccdaeba4f839c86af7f247468b5065cdcd..6823f99fd879a07dd82db00a16f57e946fed847f 100644

--- a/chrome/test/data/chromeos/net/shill_for_managed_toplevel2.json

+++ b/chrome/test/data/chromeos/net/shill_for_managed_toplevel2.json

@@ -11,7 +11,7 @@

"SaveCredentials": true,

"Security": "802_1x",

"Type": "wifi",

- "UIData": "{\"certificate_pattern\":{\"EnrollmentURI\":[\"chrome-extension://delkjfjibodjclmdijflfnimdmgdagfk/generate-cert.html\"],\"IssuerCARef\":[\"{58ac1967-a0e7-49e9-be68-123abc}\",\"{42cb13cd-140c-4941-9fb6-456def}\"]},\"certificate_type\":\"pattern\",\"onc_source\":\"user_policy\"}"

+ "UIData": "{\"certificate_pattern\":{\"EnrollmentURI\":[\"chrome-extension://delkjfjibodjclmdijflfnimdmgdagfk/generate-cert.html\"],\"IssuerCAPEMs\":[\"pem1\",\"pem2\"]},\"certificate_type\":\"pattern\",\"onc_source\":\"user_policy\"}"

"{a3860e83-f03d-4cb1-bafa-789oij}": {

"GUID": "{a3860e83-f03d-4cb1-bafa-789oij}",

@@ -19,7 +19,7 @@

"OpenVPN.AuthRetry": "interact",

// Not needed by Shill.

// "OpenVPN.AuthUserPass": "",

- "OpenVPN.CACertNSS": "{14ff4d51-64c1-4c86-a622-054dxyz}",

+ "OpenVPN.CACertPEM": [ "pem1", "pem2" ],

"OpenVPN.CompLZO": "true",

"OpenVPN.KeyDirection": "1",

// Ignored by Shill.

@@ -42,7 +42,7 @@

"ProxyConfig": "{\"mode\":\"pac_script\",\"pac_mandatory\":false,\"pac_url\":\"http://proxycfg.my.domain/proxy.dat\"}",

"SaveCredentials": false,

"Type": "vpn",

- "UIData": "{\"certificate_pattern\":{\"EnrollmentURI\":[\"chrome-extension://deicdjjibodjclmdijflfnimdmgdagfk/keygen-cert.html\"],\"IssuerCARef\":[\"{58ac1967-a0e7-49e9-be68-eb44b8827bcc}\",\"{42cb13cd-140c-4941-9fb6-0824ea2fde17}\"]},\"certificate_type\":\"pattern\",\"onc_source\":\"user_policy\"}"

+ "UIData": "{\"certificate_pattern\":{\"EnrollmentURI\":[\"chrome-extension://deicdjjibodjclmdijflfnimdmgdagfk/keygen-cert.html\"],\"IssuerCAPEMs\":[\"pem3\",\"pem4\"]},\"certificate_type\":\"pattern\",\"onc_source\":\"user_policy\"}"

// Ignored by Shill.

// "VPN.Domain": ""

}