Reland 'Require ECDHE for False Start.'

net/tools/testserver/testserver.py

 #!/usr/bin/env python
 # Copyright 2013 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """This is a simple HTTP/FTP/TCP/UDP/BASIC_AUTH_PROXY/WEBSOCKET server used for
 testing Chrome.
 
 It supports several test URLs, as specified by the handlers in TestPageHandler.
 By default, it listens on an ephemeral port and sends the port number back to
@@ skipping 2240 matching lines @@
                                   'algorithm(s) that will be accepted by the '
                                   '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. '
-                                  'Valid values are "rsa", "dhe_rsa". If '
-                                  'omitted, all algorithms will be used. This '
-                                  'option may appear multiple times, '
-                                  'indicating multiple algorithms should be '
-                                  'enabled.');
+                                  'Valid values are "rsa", "dhe_rsa", '
+                                  '"ecdhe_rsa". If omitted, all algorithms '
+                                  'will be used. This option may appear '
+                                  'multiple times, indicating multiple '
+                                  'algorithms should be enabled.');
     # TODO(davidben): Add ALPN support to tlslite.
     self.option_parser.add_option('--enable-npn', dest='enable_npn',
                                   default=False, const=True,
                                   action='store_const',
                                   help='Enable server support for the NPN '
                                   'extension. The server will advertise '
                                   'support for exactly one protocol, http/1.1')
     self.option_parser.add_option('--file-root-url', default='/files/',
                                   help='Specify a root URL for files served.')
     # TODO(ricea): Generalize this to support basic auth for HTTP too.
     self.option_parser.add_option('--ws-basic-auth', action='store_true',
                                   dest='ws_basic_auth',
                                   help='Enable basic-auth for WebSocket')
     self.option_parser.add_option('--ocsp-server-unavailable',
                                   dest='ocsp_server_unavailable',
                                   default=False, action='store_true',
                                   help='If set, the OCSP server will return '
                                   'a tryLater status rather than the actual '
                                   'OCSP response.')
     self.option_parser.add_option('--alert-after-handshake',
                                   dest='alert_after_handshake',
                                   default=False, action='store_true',
                                   help='If set, the server will send a fatal '
                                   'alert immediately after the handshake.')
 
 
 if __name__ == '__main__':
   sys.exit(ServerRunner().main())