diff options
| -rw-r--r-- | rpkid/rpki/rootd.py | 6 | ||||
| -rw-r--r-- | rpkid/tests/smoketest.py | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/rpkid/rpki/rootd.py b/rpkid/rpki/rootd.py index ca2d824c..26b5db11 100644 --- a/rpkid/rpki/rootd.py +++ b/rpkid/rpki/rootd.py @@ -272,7 +272,9 @@ class main(object): return cb(400, reason = "Could not process PDU: %s" % e) def done(r_msg): - cb(200, body = cms_msg().wrap(r_msg, self.rootd_bpki_key, self.rootd_bpki_cert)) + cb(200, body = cms_msg().wrap( + r_msg, self.rootd_bpki_key, self.rootd_bpki_cert, + self.rootd_bpki_crl if self.include_bpki_crl else None)) try: q_msg.serve_top_level(None, done) @@ -377,6 +379,8 @@ class main(object): self.rpki_subject_lifetime = rpki.sundial.timedelta.parse(self.cfg.get("rpki-subject-lifetime", "30d")) self.rpki_subject_regen = rpki.sundial.timedelta.parse(self.cfg.get("rpki-subject-regen", self.rpki_subject_lifetime.convert_to_seconds() / 2)) + self.include_bpki_crl = self.cfg.getboolean("include-bpki-crl", False) + rpki.http.server(host = self.http_server_host, port = self.http_server_port, handlers = self.up_down_handler) diff --git a/rpkid/tests/smoketest.py b/rpkid/tests/smoketest.py index deba5ad8..6d5da7ea 100644 --- a/rpkid/tests/smoketest.py +++ b/rpkid/tests/smoketest.py @@ -1439,6 +1439,8 @@ rpki-root-manifest = Bandicoot.mft rpki-class-name = Wombat rpki-subject-cert = Wombat.cer +include-bpki-crl = yes + [req] default_bits = 2048 encrypt_key = no |