From 258948849c072360876d02c1300853c293c31ab3 Mon Sep 17 00:00:00 2001 From: Rob Austein Date: Sat, 6 Oct 2007 18:13:43 +0000 Subject: Consolidate and debug PKCS #10 code. svn path=/pow/POW-0.7/lib/pkix.py; revision=1104 --- scripts/irbe-cli.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'scripts/irbe-cli.py') diff --git a/scripts/irbe-cli.py b/scripts/irbe-cli.py index eb0ca2aa..4346107a 100755 --- a/scripts/irbe-cli.py +++ b/scripts/irbe-cli.py @@ -161,10 +161,10 @@ print "Sending:" print q_xml q_cms = rpki.cms.encode(q_xml, - rpki.x509.RSA_Keypair(Auto_file = cfg.get(cfg_section, "cms-key")), + rpki.x509.RSA(Auto_file = cfg.get(cfg_section, "cms-key")), rpki.x509.X509_chain(Auto_files = cfg.multiget(cfg_section, "cms-cert"))) -r_cms = rpki.https.client(privateKey = rpki.x509.RSA_Keypair(Auto_file = cfg.get(cfg_section, "https-key")), +r_cms = rpki.https.client(privateKey = rpki.x509.RSA(Auto_file = cfg.get(cfg_section, "https-key")), certChain = rpki.x509.X509_chain(Auto_files = cfg.multiget(cfg_section, "https-cert")), x509TrustList = rpki.x509.X509_chain(Auto_files = cfg.multiget(cfg_section, "https-ta")), url = cfg.get(cfg_section, "https-url"), -- cgit v1.2.3