diff options
| author | Rob Austein <sra@hactrn.net> | 2007-08-10 22:47:59 +0000 |
|---|---|---|
| committer | Rob Austein <sra@hactrn.net> | 2007-08-10 22:47:59 +0000 |
| commit | 21479627eecc4b0d1a5427a2d2efd296165cbba9 (patch) | |
| tree | 7c8b0dc28a4c823659339e05ea33cca4bb095f1e /scripts/rpki/https.py | |
| parent | 0b13cb5aaa9163203d9dcceeab6330922671a040 (diff) | |
Reorganize X.509 code.
svn path=/scripts/irbe-cli.py; revision=860
Diffstat (limited to 'scripts/rpki/https.py')
| -rw-r--r-- | scripts/rpki/https.py | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/scripts/rpki/https.py b/scripts/rpki/https.py index 1eb6412c..4be20537 100644 --- a/scripts/rpki/https.py +++ b/scripts/rpki/https.py @@ -24,10 +24,14 @@ class CertInfo(object): self.privateKey = tlslite.api.parsePEMKey(f.read(), private=True) f.close() - chain = [rpki.x509.X509(PEM_file=PEM_file) for PEM_file in glob.glob(self.cert_dir + myname + "-*.cer")] - self.certChain = tlslite.api.X509CertChain([x.get_tlslite() for x in rpki.x509.sort_chain(chain)]) - - self.x509TrustList = [rpki.x509.X509(PEM_file=PEM_file).get_tlslite() for PEM_file in glob.glob(self.cert_dir + "*-Root.cer")] + chain = rpki.x509.X509_chain() + chain.load_from_PEM(glob.glob(self.cert_dir + myname + "-*.cer")) + chain.chainsort() + self.certChain = chain.tlslite_certChain() + + trustlist = rpki.x509.X509_chain() + trustlist.load_from_PEM(glob.glob(self.cert_dir + "*-Root.cer")) + self.x509TrustList = trustlist.tlslite_trustList() def client(msg, certInfo, host="localhost", port=4433, url="/"): httpc = tlslite.api.HTTPTLSConnection(host=host, |