diff options
| author | rsleevi@chromium.org <rsleevi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-02 14:58:02 +0000 |
|---|---|---|
| committer | rsleevi@chromium.org <rsleevi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-02 14:58:02 +0000 |
| commit | 4317ccc735d9503b3a7c9f0a7043770322dd4bd9 (patch) | |
| tree | 73955dcfb3071054b5c4b687912a63cf1b2b08fe /net/tools/testserver/testserver.py | |
| parent | 88dbeefd2138789f1b9774e27d9a59da7b88143c (diff) | |
| download | chromium_src-4317ccc735d9503b3a7c9f0a7043770322dd4bd9.zip chromium_src-4317ccc735d9503b3a7c9f0a7043770322dd4bd9.tar.gz chromium_src-4317ccc735d9503b3a7c9f0a7043770322dd4bd9.tar.bz2 | |
Support reading PEM files in TLSLite
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/9515015
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@124637 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/tools/testserver/testserver.py')
| -rwxr-xr-x | net/tools/testserver/testserver.py | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/net/tools/testserver/testserver.py b/net/tools/testserver/testserver.py index f4442ed..48defa3 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 |