net/tools/testserver/testserver.py - Issue 895853003: Update from https://crrev.com/314320

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: net/tools/testserver/testserver.py

Issue 895853003: Update from https://crrev.com/314320 (Closed) Base URL: https://github.com/domokit/mojo.git@master

Patch Set: Created 5 years, 11 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:

Index: net/tools/testserver/testserver.py

diff --git a/net/tools/testserver/testserver.py b/net/tools/testserver/testserver.py

index 3098cc06873138f397e008d8750ef4579b39a2b9..9e8b0bb3916c5fd666859ed558c3f3d7017b3765 100755

--- a/net/tools/testserver/testserver.py

+++ b/net/tools/testserver/testserver.py

@@ -2254,11 +2254,12 @@ class ServerRunner(testserver_base.TestServerRunner):

self.option_parser.add_option('--ssl-bulk-cipher', action='append',

help='Specify the bulk encryption '

'algorithm(s) that will be accepted by the '

- 'SSL server. Valid values are "aes256", '

- '"aes128", "3des", "rc4". If omitted, all '

- 'algorithms will be used. This option may '

- 'appear multiple times, indicating '

- 'multiple algorithms should be enabled.');

+ 'SSL server. Valid values are "aes128gcm", '

+ '"aes256", "aes128", "3des", "rc4". If '

+ 'omitted, all algorithms will be used. This '

+ 'option may appear multiple times, '

+ 'indicating multiple algorithms should be '

+ 'enabled.');

self.option_parser.add_option('--ssl-key-exchange', action='append',

help='Specify the key exchange algorithm(s)'

'that will be accepted by the SSL server. '

« no previous file with comments | « net/test/url_request/url_request_mock_http_job.cc ('k') | net/udp/udp_socket_win.cc » ('j') | no next file with comments »