diff options
Diffstat (limited to 'scripts/rpki')
| -rw-r--r-- | scripts/rpki/left_right.py | 5 | ||||
| -rw-r--r-- | scripts/rpki/up_down.py | 4 |
2 files changed, 5 insertions, 4 deletions
diff --git a/scripts/rpki/left_right.py b/scripts/rpki/left_right.py index eefbd14c..dc628b40 100644 --- a/scripts/rpki/left_right.py +++ b/scripts/rpki/left_right.py @@ -131,7 +131,7 @@ class bsc_elt(base_elt): elif name == "public_key": self.public_key = base64.b64decode(text) elif name == "pkcs10_cert_request": - self.pkcs10_cert_request = base64.b64decode(text) + self.pkcs10_cert_request = x509.PKCS10_Request(DER=base64.b64decode(text)) else: assert name == "bsc", "Unexpected name %s, stack %s" % (name, stack) stack.pop() @@ -141,7 +141,8 @@ class bsc_elt(base_elt): elt = self.make_elt() for cert in self.signing_cert: self.make_b64elt(elt, "signing_cert", cert.get_DER()) - self.make_b64elt(elt, "pkcs10_cert_request") + if self.pkcs10_cert_request is not None: + self.make_b64elt(elt, "pkcs10_cert_request", self.pkcs10_cert_request.get_DER()) self.make_b64elt(elt, "public_key") return elt diff --git a/scripts/rpki/up_down.py b/scripts/rpki/up_down.py index 91dc6aaa..335ddb29 100644 --- a/scripts/rpki/up_down.py +++ b/scripts/rpki/up_down.py @@ -144,13 +144,13 @@ 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 = base64.b64decode(text) + self.pkcs10 = x509.PKCS10_Request(DER=base64.b64decode(text)) stack.pop() def toXML(self): """Generate payload of "issue" PDU.""" elt = self.make_elt("request", "class_name", "req_resource_set_as", "req_resource_set_ipv4", "req_resource_set_ipv6") - elt.text = base64.b64encode(self.pkcs10) + elt.text = base64.b64encode(self.pkcs10.get_DER()) return [elt] class issue_response_pdu(list_response_pdu): |