diff options
| author | Rob Austein <sra@hactrn.net> | 2007-11-01 03:59:06 +0000 |
|---|---|---|
| committer | Rob Austein <sra@hactrn.net> | 2007-11-01 03:59:06 +0000 |
| commit | 12feb50d0494ebbf33cd18b4c8974eebf2e20158 (patch) | |
| tree | 1a31e3375a1d71448b23253bf48336e4cc8c4941 /scripts/rpki/left_right.py | |
| parent | dab64de7378853c3ab33dc7c14fd332228467541 (diff) | |
More dumb bugs
svn path=/scripts/rpki/cms.py; revision=1224
Diffstat (limited to 'scripts/rpki/left_right.py')
| -rw-r--r-- | scripts/rpki/left_right.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/scripts/rpki/left_right.py b/scripts/rpki/left_right.py index 2be222bd..a5d1fe87 100644 --- a/scripts/rpki/left_right.py +++ b/scripts/rpki/left_right.py @@ -261,7 +261,7 @@ class self_elt(data_elt): r_pdu = rpki.up_down.list_pdu.query(gctx, parent) ca_map = dict((ca.parent_resource_class, ca) for ca in rpki.sql.ca_obj.sql_fetch_where(gctx, "parent_id = %s" % parent.parent_id)) - for rc in r_pdu.payload: + for rc in r_pdu.payload.classes: if rc.class_name in ca_map: ca = ca_map[rc.class_name] del ca_map[rc.class_name] @@ -417,7 +417,7 @@ class parent_elt(data_elt): q_msg = rpki.up_down.message_pdu.make_query(q_pdu) q_elt = q_msg.toXML() rpki.relaxng.up_down.assertValid(q_elt) - q_cms = rpki.cms.xml_sign(q_elt, bsc.private_key_id, bsc.signing_cert) + q_cms = rpki.cms.xml_sign(q_elt, bsc.private_key_id, bsc.signing_cert, encoding = "UTF-8") r_cms = rpki.https.client(x509TrustList = rpki.x509.X509_chain(self.https_ta), privateKey = gctx.https_key, certChain = gctx.https_certs, @@ -488,7 +488,7 @@ class child_elt(data_elt): # r_elt = r_msg.toXML() rpki.relaxng.up_down.assertValid(r_elt) - return rpki.cms.xml_sign(r_elt, bsc.private_key_id, bsc.signing_cert) + return rpki.cms.xml_sign(r_elt, bsc.private_key_id, bsc.signing_cert, encoding = "UTF-8") class repository_elt(data_elt): """<repository/> element.""" |