diff options
| author | Rob Austein <sra@hactrn.net> | 2014-04-05 19:24:26 +0000 |
|---|---|---|
| committer | Rob Austein <sra@hactrn.net> | 2014-04-05 19:24:26 +0000 |
| commit | 3e9ffaab9aef186a3c94123bcfc8346aebda026d (patch) | |
| tree | 3127d04811c8bf780641314cbd4c7f3e5a286e91 /rpkid/rpki/rootd.py | |
| parent | b221ad67e384afbfc8513488325a6e29414e0085 (diff) | |
| parent | 5cb86d4686552904bd16affffb902410e2580471 (diff) | |
Merge tk671 (router certificate support) back to trunk. See #671.
svn path=/trunk/; revision=5753
Diffstat (limited to 'rpkid/rpki/rootd.py')
| -rw-r--r-- | rpkid/rpki/rootd.py | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/rpkid/rpki/rootd.py b/rpkid/rpki/rootd.py index 6723813c..43e84873 100644 --- a/rpkid/rpki/rootd.py +++ b/rpkid/rpki/rootd.py @@ -37,7 +37,6 @@ import rpki.exceptions import rpki.relaxng import rpki.sundial import rpki.log -import rpki.oids import rpki.daemonize rootd = None @@ -50,7 +49,7 @@ class list_pdu(rpki.up_down.list_pdu): class issue_pdu(rpki.up_down.issue_pdu): def serve_pdu(self, q_msg, r_msg, ignored, callback, errback): - self.pkcs10.check_valid_rpki() + self.pkcs10.check_valid_request_ca() r_msg.payload = rpki.up_down.issue_response_pdu() rootd.compose_response(r_msg, self.pkcs10) callback() @@ -230,7 +229,7 @@ class main(object): manifest_keypair = rpki.x509.RSA.generate() manifest_cert = self.rpki_root_cert.issue( keypair = self.rpki_root_key, - subject_key = manifest_keypair.get_RSApublic(), + subject_key = manifest_keypair.get_public(), serial = self.serial_number, sia = (None, None, self.rpki_base_uri + self.rpki_root_manifest), aia = self.rpki_root_cert_uri, |