From 4d7072bd10f807558dfd60c2a3e65fe6584bcdb3 Mon Sep 17 00:00:00 2001
From: Rob Austein <sra@hactrn.net>
Date: Mon, 24 Dec 2007 09:31:48 +0000
Subject: Teach config parser about default sections.
svn path=/scripts/Makefile; revision=1439
---
scripts/irbe-cli.py | 17 ++++++++---------
1 file changed, 8 insertions(+), 9 deletions(-)
(limited to 'scripts/irbe-cli.py')
diff --git a/scripts/irbe-cli.py b/scripts/irbe-cli.py
index 8ac8dc74..21c24c70 100755
--- a/scripts/irbe-cli.py
+++ b/scripts/irbe-cli.py
@@ -137,8 +137,7 @@ for o, a in opts:
if not argv:
usage(1)
-cfg = rpki.config.parser(cfg_file)
-cfg_section = "irbe-cli"
+cfg = rpki.config.parser(cfg_file, "irbe-cli")
q_msg = rpki.left_right.msg()
@@ -165,16 +164,16 @@ except lxml.etree.DocumentInvalid:
raise
q_cms = rpki.cms.sign(q_xml,
- rpki.x509.RSA(Auto_file = cfg.get(cfg_section, "cms-key")),
- rpki.x509.X509_chain(Auto_files = cfg.multiget(cfg_section, "cms-cert")))
+ rpki.x509.RSA(Auto_file = cfg.get("cms-key")),
+ rpki.x509.X509_chain(Auto_files = cfg.multiget("cms-cert")))
-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"),
+r_cms = rpki.https.client(privateKey = rpki.x509.RSA(Auto_file = cfg.get("https-key")),
+ certChain = rpki.x509.X509_chain(Auto_files = cfg.multiget("https-cert")),
+ x509TrustList = rpki.x509.X509_chain(Auto_files = cfg.multiget("https-ta")),
+ url = cfg.get("https-url"),
msg = q_cms)
-r_xml = rpki.cms.verify(r_cms, rpki.x509.X509(Auto_file = cfg.get(cfg_section, "cms-ta")))
+r_xml = rpki.cms.verify(r_cms, rpki.x509.X509(Auto_file = cfg.get("cms-ta")))
r_elt = lxml.etree.fromstring(r_xml)
try:
--
cgit v1.2.3