diff options
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/rpki/resource_set.py | 4 | ||||
| -rw-r--r-- | scripts/rpki/up_down.py | 9 |
2 files changed, 4 insertions, 9 deletions
diff --git a/scripts/rpki/resource_set.py b/scripts/rpki/resource_set.py index d5f350ee..0c09f19d 100644 --- a/scripts/rpki/resource_set.py +++ b/scripts/rpki/resource_set.py @@ -396,7 +396,9 @@ def parse_extensions(exts): if fam[0] == resource_set_ipv6.afi: assert v6 is None v6 = resource_set_ipv6(fam[1]) - return as, v4, v6 + return as or resource_set_as(), \ + v4 or resource_set_ipv4(), \ + v6 or resource_set_ipv6() # Test suite for set operations. This will probably go away eventually diff --git a/scripts/rpki/up_down.py b/scripts/rpki/up_down.py index 511b6e73..a7015396 100644 --- a/scripts/rpki/up_down.py +++ b/scripts/rpki/up_down.py @@ -268,7 +268,6 @@ class issue_pdu(base_elt): # Generate new cert or regenerate old one if necessary if child_cert is None: - print "Issuing because no child cert (yet)" child_cert = ca_detail.issue(gctx = gctx, ca = ca, child = child, @@ -277,13 +276,7 @@ class issue_pdu(base_elt): as = rc_as, v4 = rc_v4, v6 = rc_v6) - elif (child_cert is not None and ((rc_as, rc_v4, rc_v6) != child_cert.cert.get_3779resources())) or \ - (child_cert is not None and child_cert.cert.get_SIA() != req_sia): - print "Reissuing:" - print " Requested resources:", repr((rc_as, rc_v4, rc_v6)) - print " Previous resources: ", repr(child_cert.cert.get_3779resources()) - print " Requested SIA:", repr(req_sia) - print " Previous SIA: ", repr(child_cert.cert.get_SIA()) + elif ((rc_as, rc_v4, rc_v6) != child_cert.cert.get_3779resources()) or child_cert.cert.get_SIA() != req_sia: child_cert.reissue(gctx = gctx, ca_detail = ca_detail, as = rc_as, |