diff options
| -rw-r--r-- | scripts/pkcs10.py | 2 | ||||
| -rw-r--r-- | scripts/rpki/left_right.py | 2 | ||||
| -rw-r--r-- | scripts/rpki/pkcs10.py | 2 | ||||
| -rw-r--r-- | scripts/rpki/up_down.py | 9 | ||||
| -rw-r--r-- | scripts/rpki/x509.py | 2 |
5 files changed, 8 insertions, 9 deletions
diff --git a/scripts/pkcs10.py b/scripts/pkcs10.py index 3a88b779..683f94df 100644 --- a/scripts/pkcs10.py +++ b/scripts/pkcs10.py @@ -13,7 +13,7 @@ def hexify(thing): return ":".join(["%02X" % ord(i) for i in thing]) for name in glob.glob("resource-cert-samples/*.req") + glob.glob("biz-certs/*.req"): - pkcs10 = rpki.x509.PKCS10_Request(Auto_file = name).get_POWpkix() + pkcs10 = rpki.x509.PKCS10(Auto_file = name).get_POWpkix() print "[", name, "]" diff --git a/scripts/rpki/left_right.py b/scripts/rpki/left_right.py index 8bd8daf4..2ce5f0ae 100644 --- a/scripts/rpki/left_right.py +++ b/scripts/rpki/left_right.py @@ -287,7 +287,7 @@ class bsc_elt(data_elt): elif name == "public_key": self.public_key = base64.b64decode(text) elif name == "pkcs10_cert_request": - self.pkcs10_cert_request = rpki.x509.PKCS10_Request(Base64=text) + self.pkcs10_cert_request = rpki.x509.PKCS10(Base64=text) else: assert name == "bsc", "Unexpected name %s, stack %s" % (name, stack) stack.pop() diff --git a/scripts/rpki/pkcs10.py b/scripts/rpki/pkcs10.py index c298db20..4d77c442 100644 --- a/scripts/rpki/pkcs10.py +++ b/scripts/rpki/pkcs10.py @@ -27,7 +27,7 @@ def make_request(keypair): i,o = os.popen2(["openssl", "req", "-config", config_filename, "-new", "-key", "/dev/stdin", "-outform", "DER"]) i.write(keypair.get_PEM()) i.close() - pkcs10 = rpki.x509.PKCS10_Request(DER = o.read()) + pkcs10 = rpki.x509.PKCS10(DER = o.read()) o.close() finally: diff --git a/scripts/rpki/up_down.py b/scripts/rpki/up_down.py index 3cdc6af1..f831abb1 100644 --- a/scripts/rpki/up_down.py +++ b/scripts/rpki/up_down.py @@ -219,7 +219,7 @@ class issue_pdu(base_elt): def endElement(self, stack, name, text): """Handle "issue" PDU.""" assert name == "request", "Unexpected name %s, stack %s" % (name, stack) - self.pkcs10 = rpki.x509.PKCS10_Request(Base64=text) + self.pkcs10 = rpki.x509.PKCS10(Base64=text) stack.pop() def toXML(self): @@ -294,16 +294,15 @@ class issue_pdu(base_elt): r_msg.payload.classes.append(rc) @classmethod - def query(cls, gctx, ca): + def query(cls, gctx, ca, sia): """Send an "issue" request to associated with ca.""" parent = rpki.left_right.parent_elt.sql_fetch(gctx.db, gctx.cur, ca.parent_id) ca_detail = rpki.sql.ca_detail_obj.sql_fetch_active(gctx.db, gctx.cur, ca.ca_id) if ca_detail is None: ca_detail = rpki.sql.ca_detail_obj.create(gctx, ca) - - raise NotImplementedError, "Not finished" - self = cls() + self.class_name = ca.parent_resource_class + self.pkcs10 = rpki.x509.PKCS10(ca_detail.private_key_id, sia) return parent.query_up_down(gctx, self) class issue_response_pdu(class_response_syntax): diff --git a/scripts/rpki/x509.py b/scripts/rpki/x509.py index 3eb16c7d..4aaeb695 100644 --- a/scripts/rpki/x509.py +++ b/scripts/rpki/x509.py @@ -350,7 +350,7 @@ class X509_chain(list): """Load a set of certs from a list of DER or PEM files (guessing).""" self.extend([X509(Auto_file=f) for f in files]) -class PKCS10_Request(DER_object): +class PKCS10(DER_object): """Class to hold a PKCS #10 request.""" formats = ("DER", "POWpkix") |