commit 06a878352e758adca54cb19e1b572c64ba9d653c
author tommycli <tommycli@chromium.org> Thu Sep 17 10:27:22 2015 -0700
committer Commit bot <commit-bot@chromium.org> Thu Sep 17 17:28:03 2015 +0000
tree 236037c7147737b3ffdc0ef87059919aaa9d69ff
parent 442e3dfbb9e1cee69ea46ff0a9131c0c5b65a2e2

Revert of Add flags to python test server for channel id, extended master secret, and token binding (patchset #2 id:20001 of https://codereview.chromium.org/1347503002/ )

Reason for revert:
This change tripped the Linux Tests (valgrind) memory bots.

See: http://build.chromium.org/p/chromium.memory.fyi/builders/Linux%20Tests%20(valgrind)(1)

First failure:
http://build.chromium.org/p/chromium.memory.fyi/builders/Linux%20Tests%20%28valgrind%29%281%29/builds/43655

Cause:
Newly added member variables are not initialized in second constructor.

Thanks and sorry for revert.

Original issue's description:
> Add flags to python test server for channel id, extended master secret, and token binding
>
> BUG=467312
>
> Committed: https://crrev.com/22e67634e17914c5dddc6ad2649a4bf701908311
> Cr-Commit-Position: refs/heads/master@{#349164}

TBR=davidben@chromium.org,rsleevi@chromium.org,nharper@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=467312

Review URL: https://codereview.chromium.org/1351133002

Cr-Original-Commit-Position: refs/heads/master@{#349439}
Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src
Cr-Mirrored-Commit: 13f982af192e9fecd145500670198adc515d4429

testserver.py

diff --git a/testserver.py b/testserver.py
index 99684c8..ad1a57d 100755
--- a/testserver.py
+++ b/testserver.py
@@ -158,8 +158,7 @@
                record_resume_info, tls_intolerant,
                tls_intolerance_type, signed_cert_timestamps,
                fallback_scsv_enabled, ocsp_response,
-               alert_after_handshake, disable_channel_id, disable_ems,
-               token_binding_params):
+               alert_after_handshake):
     self.cert_chain = tlslite.api.X509CertChain()
     self.cert_chain.parsePemList(pem_cert_and_key)
     # Force using only python implementation - otherwise behavior is different
@@ -205,12 +204,6 @@
       self.ssl_handshake_settings.tlsIntoleranceType = tls_intolerance_type
     if alert_after_handshake:
       self.ssl_handshake_settings.alertAfterHandshake = True
-    if disable_channel_id:
-      self.ssl_handshake_settings.enableChannelID = False
-    if disable_ems:
-      self.ssl_handshake_settings.enableExtendedMasterSecret = False
-    self.ssl_handshake_settings.supportedTokenBindingParams = \
-        token_binding_params
 
     if record_resume_info:
       # If record_resume_info is true then we'll replace the session cache with
@@ -2064,10 +2057,7 @@
                                  "base64"),
                              self.options.fallback_scsv,
                              stapled_ocsp_response,
-                             self.options.alert_after_handshake,
-                             self.options.disable_channel_id,
-                             self.options.disable_extended_master_secret,
-                             self.options.token_binding_params)
+                             self.options.alert_after_handshake)
         print 'HTTPS server started on https://%s:%d...' % \
             (host, server.server_port)
       else:
@@ -2313,11 +2303,6 @@
                                   default=False, action='store_true',
                                   help='If set, the FTP server will not create '
                                   'an anonymous user.')
-    self.option_parser.add_option('--disable-channel-id', action='store_true')
-    self.option_parser.add_option('--disable-extended-master-secret',
-                                  action='store_true')
-    self.option_parser.add_option('--token-binding-params', action='append',
-                                  default=[], type='int')
 
 
 if __name__ == '__main__':