diff options
| author | Rob Austein <sra@hactrn.net> | 2007-11-16 20:08:42 +0000 |
|---|---|---|
| committer | Rob Austein <sra@hactrn.net> | 2007-11-16 20:08:42 +0000 |
| commit | 8bde316d2ce3fd368f35ba533e094c1651006956 (patch) | |
| tree | 82f46848ed47684648e2398afe4105edf34b3278 /scripts/rpki/up_down.py | |
| parent | 3f093365dca5aef47a58eb85ab0459d60de0df9d (diff) | |
Consolidate URI generation
svn path=/scripts/README; revision=1302
Diffstat (limited to 'scripts/rpki/up_down.py')
| -rw-r--r-- | scripts/rpki/up_down.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/scripts/rpki/up_down.py b/scripts/rpki/up_down.py index 0804bd61..a094b308 100644 --- a/scripts/rpki/up_down.py +++ b/scripts/rpki/up_down.py @@ -185,7 +185,7 @@ class list_pdu(base_elt): child_id = %s AND ca_detail_id = %s """ % (child.child_id, ca_detail.ca_detail_id)): c = certificate_elt() - c.cert_url = multi_uri(ca.sia_uri + child_cert.cert.gSKI() + ".cer") + c.cert_url = multi_uri(child_cert.uri(ca)) c.cert = child_cert.cert rc.certs.append(c) rc.issuer = ca_detail.latest_ca_cert @@ -287,7 +287,7 @@ class issue_pdu(base_elt): rpki.sql.sql_sweep(gctx) assert child_cert and child_cert.sql_in_db c = certificate_elt() - c.cert_url = multi_uri(ca.sia_uri + child_cert.cert.gSKI() + ".cer") + c.cert_url = multi_uri(child_cert.uri(ca)) c.cert = child_cert.cert rc = class_elt() rc.class_name = str(ca_id) @@ -303,7 +303,7 @@ class issue_pdu(base_elt): """Send an "issue" request to parent associated with ca.""" assert ca_detail is not None and ca_detail.state not in ("deprecated", "revoked") sia = ((rpki.oids.name2oid["id-ad-caRepository"], ("uri", ca.sia_uri)), - (rpki.oids.name2oid["id-ad-rpkiManifest"], ("uri", ca.sia_uri + ca_detail.public_key.gSKI() + ".mnf"))) + (rpki.oids.name2oid["id-ad-rpkiManifest"], ("uri", ca_detail.manifest_uri(ca)))) self = cls() self.class_name = ca.parent_resource_class self.pkcs10 = rpki.x509.PKCS10.create_ca(ca_detail.private_key_id, sia) |