From 5a007a74529766b5b27f8e054d4fad79172d2d5c Mon Sep 17 00:00:00 2001 From: Rob Austein Date: Wed, 29 Jan 2014 03:33:37 +0000 Subject: Clean up OID database. Would have done this years ago, had I understood how the globals() function works. svn path=/branches/tk671/; revision=5652 --- rpkid/rpki/rootd.py | 1 - 1 file changed, 1 deletion(-) (limited to 'rpkid/rpki/rootd.py') diff --git a/rpkid/rpki/rootd.py b/rpkid/rpki/rootd.py index 6723813c..49488602 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 -- cgit v1.2.3 From 2645eabce95e2cbca2e81339b093f457d0c3310e Mon Sep 17 00:00:00 2001 From: Rob Austein Date: Wed, 29 Jan 2014 16:22:03 +0000 Subject: Rework PKCS #10 sanity checking code. svn path=/branches/tk671/; revision=5653 --- rpkid/rpki/rootd.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'rpkid/rpki/rootd.py') diff --git a/rpkid/rpki/rootd.py b/rpkid/rpki/rootd.py index 49488602..e0c59726 100644 --- a/rpkid/rpki/rootd.py +++ b/rpkid/rpki/rootd.py @@ -49,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() -- cgit v1.2.3 From 401bbea99c1ba43ae0987b6346c65293a8efafa0 Mon Sep 17 00:00:00 2001 From: Rob Austein Date: Thu, 20 Feb 2014 23:03:11 +0000 Subject: Whack RSA-specific code to a more general API using PrivateKey and PublicKey classes, with RSA and ECDSA as subclasses extending PrivateKey. Revised API not necessarily in final form yet, but good enough for smoketest to generate ECDSA keys for testing router certs. svn path=/branches/tk671/; revision=5679 --- rpkid/rpki/rootd.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'rpkid/rpki/rootd.py') diff --git a/rpkid/rpki/rootd.py b/rpkid/rpki/rootd.py index e0c59726..43e84873 100644 --- a/rpkid/rpki/rootd.py +++ b/rpkid/rpki/rootd.py @@ -229,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, -- cgit v1.2.3