aboutsummaryrefslogtreecommitdiff
path: root/rpkid
diff options
context:
space:
mode:
Diffstat (limited to 'rpkid')
-rw-r--r--rpkid/rpki/x509.py12
1 files changed, 9 insertions, 3 deletions
diff --git a/rpkid/rpki/x509.py b/rpkid/rpki/x509.py
index 6f28e6f7..9befb320 100644
--- a/rpkid/rpki/x509.py
+++ b/rpkid/rpki/x509.py
@@ -693,9 +693,15 @@ class X509(DER_object):
if resources is not None:
cert.setRFC3779(
- asn = ((r.min, r.max) for r in resources.asn),
- ipv4 = ((rpki.POW.IPAddress(r.min, 4), rpki.POW.IPAddress(r.max, 4)) for r in resources.v4),
- ipv6 = ((rpki.POW.IPAddress(r.min, 6), rpki.POW.IPAddress(r.max, 6)) for r in resources.v6))
+ asn = (("inherit" if resources.asn.inherit else
+ ((r.min, r.max) for r in resources.asn))
+ or None),
+ ipv4 = (("inherit" if resources.v4.inherit else
+ ((r.min, r.max) for r in resources.v4))
+ or None),
+ ipv6 = (("inherit" if resources.v6.inherit else
+ ((r.min, r.max) for r in resources.v6))
+ or None))
cert.sign(keypair.get_POW(), rpki.POW.SHA256_DIGEST)