From 065c44e912a7fca14ae641a09aa89d0a573c3cdf Mon Sep 17 00:00:00 2001 From: Rob Austein Date: Thu, 20 Feb 2014 06:43:48 +0000 Subject: Checkpoint. Now generating something that looks a bit like a router cert, but not right yet: RSA where should be ECDSA, EKU missing, and EE certificate class's .reissue() method isn't working properly yet. svn path=/branches/tk671/; revision=5673 --- rpkid/rpki/old_irdbd.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'rpkid/rpki/old_irdbd.py') diff --git a/rpkid/rpki/old_irdbd.py b/rpkid/rpki/old_irdbd.py index a9585307..25ceb656 100644 --- a/rpkid/rpki/old_irdbd.py +++ b/rpkid/rpki/old_irdbd.py @@ -170,18 +170,19 @@ class main(object): self.cur.execute( """ - SELECT ee_certificate_id, gski, router_id, valid_until + SELECT ee_certificate_id, pkcs10, gski, router_id, valid_until FROM ee_certificate WHERE self_handle = %s """, (q_pdu.self_handle,)) - for ee_certificate_id, gski, router_id, valid_until in self.cur.fetchall(): + for ee_certificate_id, pkcs10, gski, router_id, valid_until in self.cur.fetchall(): - r_pdu = rpki.left_right.ee_certificates_request_elt() + r_pdu = rpki.left_right.list_ee_certificate_requests_elt() r_pdu.tag = q_pdu.tag r_pdu.self_handle = q_pdu.self_handle r_pdu.valid_until = valid_until.strftime("%Y-%m-%dT%H:%M:%SZ") + r_pdu.pkcs10 = rpki.x509.PKCS10(DER = pkcs10) r_pdu.gski = gski r_pdu.router_id = router_id -- cgit v1.2.3