diff options
| author | Rob Austein <sra@hactrn.net> | 2007-09-25 20:11:56 +0000 |
|---|---|---|
| committer | Rob Austein <sra@hactrn.net> | 2007-09-25 20:11:56 +0000 |
| commit | 36677da9db92362b91a1320c0dd37baae26776a7 (patch) | |
| tree | ff70986c1256585b42af1d29af9472874af6c7a1 /scripts/rpki/up_down.py | |
| parent | 16058160b850ec9b4db3f8291a38728f816a4dd1 (diff) | |
Shorten a few tediously long identifiers
svn path=/docs/rpki-db-schema.pdf; revision=1031
Diffstat (limited to 'scripts/rpki/up_down.py')
| -rw-r--r-- | scripts/rpki/up_down.py | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/scripts/rpki/up_down.py b/scripts/rpki/up_down.py index 06aafa05..2b424d9b 100644 --- a/scripts/rpki/up_down.py +++ b/scripts/rpki/up_down.py @@ -137,14 +137,14 @@ class class_elt(base_elt): def cons_resource_class(gctx, now, child, ca_id, irdb_as, irdb_v4, irdb_v6): ca_detail = None for c in rpki.sql.ca_detail_elt.sql_fetch_where(gctx.db, gctx.cur, "ca_id = %s" % ca_id): - if c.latest_ca_cert_over_public_key is not None and \ - c.latest_ca_cert_over_public_key.getNotBefore() <= now and \ - c.latest_ca_cert_over_public_key.getNotAfter() >= now and \ - (ca_detail is None or c.latest_ca_cert_over_public_key.getNotBefore() > ca_detail.latest_ca_cert_over_public_key.getNotBefore()): + if c.latest_ca_cert is not None and \ + c.latest_ca_cert.getNotBefore() <= now and \ + c.latest_ca_cert.getNotAfter() >= now and \ + (ca_detail is None or c.latest_ca_cert.getNotBefore() > ca_detail.latest_ca_cert.getNotBefore()): ca_detail = c if not ca_detail: return None - rc_as, rc_v4, rc_v6 = ca_detail.latest_ca_cert_over_public_key.get_3779resources() + rc_as, rc_v4, rc_v6 = ca_detail.latest_ca_cert.get_3779resources() rc_as.intersection(irdb_as) rc_v4.intersection(irdb_v4) rc_v6.intersection(irdb_v6) @@ -161,7 +161,7 @@ def cons_resource_class(gctx, now, child, ca_id, irdb_as, irdb_v4, irdb_v6): c.cert_url = "rsync://niy.invalid" c.cert = child_cert.cert rc.certs.append(c) - rc.issuer = ca_detail.latest_ca_cert_over_public_key + rc.issuer = ca_detail.latest_ca_cert return rc class list_pdu(base_elt): |