net/tools/testserver/testserver.py - Issue 9515015: Support reading PEM files in TLSLite

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 9515015: Support reading PEM files in TLSLite (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Fix pem blocks Created 8 years, 10 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 f4442ed8d763074c8d97555cea7c8e74dedf99d4..48defa3180f41dd7d0e873e70f6ed9cc495d8252 100755

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

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

@@ -120,9 +120,7 @@ class HTTPSServer(tlslite.api.TLSSocketServerMixIn,

ssl_client_auth, ssl_client_cas, ssl_bulk_ciphers,

record_resume_info):

s = open(cert_path).read()

- x509 = tlslite.api.X509()

- x509.parse(s)

- self.cert_chain = tlslite.api.X509CertChain([x509])

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

s = open(cert_path).read()

self.private_key = tlslite.api.parsePEMKey(s, private=True)

self.ssl_client_auth = ssl_client_auth

« no previous file with comments | « no previous file | third_party/tlslite/README.chromium » ('j') | third_party/tlslite/tlslite/X509.py » ('J')