chrome/browser/chromeos/login/test/https_forwarder.py - Issue 210323002: Update tlslite to 0.4.6.

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/browser/chromeos/login/test/https_forwarder.py

Issue 210323002: Update tlslite to 0.4.6. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Executable bit and --similarity=80 Created 6 years, 8 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: chrome/browser/chromeos/login/test/https_forwarder.py

diff --git a/chrome/browser/chromeos/login/test/https_forwarder.py b/chrome/browser/chromeos/login/test/https_forwarder.py

index eaa0db22b11e7f0e9f096aa01489c0b79b62379b..5163220d4f1ce3935b53c352887fc64fde7690cc 100644

--- a/chrome/browser/chromeos/login/test/https_forwarder.py

+++ b/chrome/browser/chromeos/login/test/https_forwarder.py

@@ -84,7 +84,8 @@ class MultiThreadedHTTPSServer(SocketServer.ThreadingMixIn,

request_hander_class: The class that will handle requests to the server.

pem_cert_and_key: Path to file containing the https cert and private key.

"""

- self.cert_chain = tlslite.api.X509CertChain().parseChain(pem_cert_and_key)

+ self.cert_chain = tlslite.api.X509CertChain()

+ self.cert_chain.parsePemList(pem_cert_and_key)

# Force using only python implementation - otherwise behavior is different

# depending on whether m2crypto Python module is present (error is thrown

# when it is). m2crypto uses a C (based on OpenSSL) implementation under

« no previous file with comments | « no previous file | chrome/browser/policy/test/policy_testserver.py » ('j') | no next file with comments »