From e97b836fbf79e9dc4e354ce6b8896454ef18533e Mon Sep 17 00:00:00 2001 From: Rob Austein Date: Fri, 26 Jun 2009 01:18:11 +0000 Subject: Checkpoint svn path=/myrpki/myrpki.py; revision=2538 --- myrpki/myrpki.py | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) (limited to 'myrpki/myrpki.py') diff --git a/myrpki/myrpki.py b/myrpki/myrpki.py index d6841041..79fb6239 100644 --- a/myrpki/myrpki.py +++ b/myrpki/myrpki.py @@ -158,7 +158,7 @@ def bpki_ca(e, bpki_ca_key_file, bpki_ca_cert_file, cfg_file): PEMElement(e, "bpki_ca_certificate", bpki_ca_cert_file) -def bpki_ee(e, bpki_ee_req_file, bpki_ee_cert_file): +def bpki_ee(e, bpki_ee_req_file, bpki_ee_cert_file, bpki_ca_cert_file, bpki_ca_key_file): if os.path.exists(bpki_ee_req_file): @@ -172,6 +172,9 @@ def bpki_ee(e, bpki_ee_req_file, bpki_ee_cert_file): PEMElement(e, "bpki_ee_certificate", bpki_ee_cert_file) +def bpki_crl(e): + pass + def extract_resources(): pass @@ -211,8 +214,16 @@ def main(): e = Element("myrpki", xmlns = namespace, version = "1", handle = my_handle) roas.xml(e) kids.xml(e) - bpki_ca(e, bpki_ca_key_file, bpki_ca_cert_file, cfg_file) - bpki_ee(e, bpki_ee_req_file, bpki_ee_cert_file) + bpki_ca(e, + bpki_ca_key_file = bpki_ca_key_file, + bpki_ca_cert_file = bpki_ca_cert_file, + cfg_file = cfg_file) + bpki_ee(e, + bpki_ee_req_file = bpki_ee_req_file, + bpki_ee_cert_file = bpki_ee_cert_file, + bpki_ca_cert_file = bpki_ca_cert_file, + bpki_ca_key_file = bpki_ca_key_file) + bpki_crl(e) ElementTree(e).write(output_filename + ".tmp") os.rename(output_filename + ".tmp", output_filename) -- cgit v1.2.3