diff options
author | Rob Austein <sra@hactrn.net> | 2008-05-05 13:14:39 +0000 |
---|---|---|
committer | Rob Austein <sra@hactrn.net> | 2008-05-05 13:14:39 +0000 |
commit | f759964323e1ab1bc20018d74f59282550a81365 (patch) | |
tree | f79b32940dc525f431ffbe0eae5b0eb2ab508fca /rpkid/rootd.py | |
parent | 8166b93240e5c214d91f5dee531060972f13efcc (diff) |
Clear up whining about missing CRLs.
svn path=/rpkid/rootd.py; revision=1741
Diffstat (limited to 'rpkid/rootd.py')
-rwxr-xr-x | rpkid/rootd.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/rpkid/rootd.py b/rpkid/rootd.py index 8944d7f2..1922a4c9 100755 --- a/rpkid/rootd.py +++ b/rpkid/rootd.py @@ -138,13 +138,13 @@ def up_down_handler(query, path): return 400, "Could not process PDU: %s" % data try: r_msg = q_msg.serve_top_level(None) - r_cms = cms_msg.wrap(r_msg, rootd_bpki_key, rootd_bpki_cert) + r_cms = cms_msg.wrap(r_msg, rootd_bpki_key, rootd_bpki_cert, rootd_bpki_crl) return 200, r_cms except Exception, data: rpki.log.error(traceback.format_exc()) try: r_msg = q_msg.serve_error(data) - r_cms = cms_msg.wrap(r_msg, rootd_bpki_key, rootd_bpki_cert) + r_cms = cms_msg.wrap(r_msg, rootd_bpki_key, rootd_bpki_cert, rootd_bpki_crl) return 200, r_cms except Exception, data: rpki.log.error(traceback.format_exc()) @@ -172,6 +172,7 @@ cfg = rpki.config.parser(cfg_file, "rootd") bpki_ta = rpki.x509.X509(Auto_file = cfg.get("bpki-ta")) rootd_bpki_key = rpki.x509.RSA( Auto_file = cfg.get("rootd-bpki-key")) rootd_bpki_cert = rpki.x509.X509(Auto_file = cfg.get("rootd-bpki-cert")) +rootd_bpki_crl = rpki.x509.CRL( Auto_file = cfg.get("rootd-bpki-crl")) child_bpki_cert = rpki.x509.X509(Auto_file = cfg.get("child-bpki-cert")) https_server_host = cfg.get("server-host", "") |