diff options
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/rpki/up_down.py | 13 | ||||
| -rwxr-xr-x | scripts/testroot.py | 3 |
2 files changed, 10 insertions, 6 deletions
diff --git a/scripts/rpki/up_down.py b/scripts/rpki/up_down.py index 7a9f0d7e..82203603 100644 --- a/scripts/rpki/up_down.py +++ b/scripts/rpki/up_down.py @@ -118,6 +118,8 @@ class certificate_elt(base_elt): class class_elt(base_elt): """Up-Down protocol representation of a resource class.""" + issuer = None + def __init__(self): """Initialize class_elt.""" self.certs = [] @@ -151,7 +153,8 @@ class class_elt(base_elt): elt = self.make_elt("class", "class_name", "cert_url", "resource_set_as", "resource_set_ipv4", "resource_set_ipv6", "suggested_sia_head") elt.extend([i.toXML() for i in self.certs]) - self.make_b64elt(elt, "issuer", self.issuer.get_DER()) + if self.issuer is not None: + self.make_b64elt(elt, "issuer", self.issuer.get_DER()) return elt class list_pdu(base_elt): @@ -460,16 +463,16 @@ class message_pdu(base_elt): def serve_top_level(self, gctx, child): """Serve one message request PDU.""" r_msg = message_pdu() - r_msg.sender = self.receiver - r_msg.receiver = self.sender + r_msg.sender = self.recipient + r_msg.recipient = self.sender self.payload.serve_pdu(gctx, self, r_msg, child) return r_msg def serve_error(self, exception): """Generate an error_response message PDU.""" r_msg = message_pdu() - r_msg.sender = self.receiver - r_msg.receiver = self.sender + r_msg.sender = self.recipient + r_msg.recipient = self.sender r_msg.payload = error_response_pdu(exception) return r_msg diff --git a/scripts/testroot.py b/scripts/testroot.py index 5cd224d9..0cfb2862 100755 --- a/scripts/testroot.py +++ b/scripts/testroot.py @@ -40,7 +40,8 @@ def compose_response(r_msg): rc.certs.append(rpki.up_down.certificate_elt()) rc.certs[0].cert_url = rpki.up_down.multi_uri(root_base + rpki_subject.gSKI() + ".cer") rc.certs[0].cert = rpki_subject - rc.issuer = rpki.issuer + rc.issuer = rpki_issuer + print rc, rc.certs, rc.certs[0], rc.issuer class list_pdu(rpki.up_down.list_pdu): def serve_pdu(self, xxx1, q_msg, r_msg, xxx2): |