From 57995ddafe5df6e78110263a5d421d9a6a9a3de9 Mon Sep 17 00:00:00 2001 From: Rob Austein <sra@hactrn.net> Date: Sat, 25 Aug 2007 16:46:05 +0000 Subject: Finally get rid of rpki.https.CertInfo kludge. svn path=/scripts/http-client.py; revision=912 --- scripts/irbe-cli.py | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) (limited to 'scripts/irbe-cli.py') diff --git a/scripts/irbe-cli.py b/scripts/irbe-cli.py index 7039cac9..a0afafa7 100755 --- a/scripts/irbe-cli.py +++ b/scripts/irbe-cli.py @@ -136,11 +136,13 @@ def main(): rng = rpki.relaxng.RelaxNG(cfg.get(section, "rng-schema")) - print "rpki.https.CertInfo() needs rewriting!" - # - # ... but use it for now - # - httpsCerts = rpki.https.CertInfo(cfg, section) + privateKey = rpki.x509.RSA_Keypair(PEM_file = cfg.get(section, "https-key")) + + certChain = rpki.x509.X509_chain() + certChain.load_from_PEM(cfg.multiget(section, "https-cert")) + + x509TrustList = rpki.x509.X509_chain() + x509TrustList.load_from_PEM(cfg.multiget(section, "https-ta")) q_msg = rpki.left_right.msg() @@ -169,7 +171,8 @@ def main(): q_cms = rpki.cms.encode(q_xml, cfg.get(section, "cms-key"), cfg.multiget(section, "cms-cert")) - r_cms = rpki.https.client(certInfo=httpsCerts, msg=q_cms, url="/left-right") + r_cms = rpki.https.client(privateKey=privateKey, certChain=certChain, x509TrustList=x509TrustList, + msg=q_cms, url="/left-right") r_xml = rpki.cms.decode(r_cms, cfg.get(section, "cms-peer")) -- cgit v1.2.3