aboutsummaryrefslogtreecommitdiff
path: root/rpkid
diff options
context:
space:
mode:
Diffstat (limited to 'rpkid')
-rwxr-xr-xrpkid/rootd.py6
-rw-r--r--rpkid/rpki/rpki_engine.py6
2 files changed, 6 insertions, 6 deletions
diff --git a/rpkid/rootd.py b/rpkid/rootd.py
index b6a77a97..c2fa1391 100755
--- a/rpkid/rootd.py
+++ b/rpkid/rootd.py
@@ -129,9 +129,9 @@ def issue_subject_cert_maybe(new_pkcs10):
f.write(crl.get_DER())
f.close()
manifest_resources = rpki.resource_set.resource_bag(
- asn = rpki.resource_set.resource_set_as("<inherit>"),
- v4 = rpki.resource_set.resource_set_ipv4("<inherit>"),
- v6 = rpki.resource_set.resource_set_ipv6("<inherit>"))
+ asn = rpki.resource_set.resource_set_as(rpki.resource_set.inherit_token),
+ v4 = rpki.resource_set.resource_set_ipv4(rpki.resource_set.inherit_token),
+ v6 = rpki.resource_set.resource_set_ipv6(rpki.resource_set.inherit_token))
manifest_keypair = rpki.x509.RSA.generate()
manifest_cert = rpki_root_cert.issue(
keypair = rpki_root_key,
diff --git a/rpkid/rpki/rpki_engine.py b/rpkid/rpki/rpki_engine.py
index d07d0e00..69a196e6 100644
--- a/rpkid/rpki/rpki_engine.py
+++ b/rpkid/rpki/rpki_engine.py
@@ -762,9 +762,9 @@ class ca_detail_obj(rpki.sql.sql_persistent):
"""
resources = rpki.resource_set.resource_bag(
- asn = rpki.resource_set.resource_set_as("<inherit>"),
- v4 = rpki.resource_set.resource_set_ipv4("<inherit>"),
- v6 = rpki.resource_set.resource_set_ipv6("<inherit>"))
+ asn = rpki.resource_set.resource_set_as(rpki.resource_set.inherit_token),
+ v4 = rpki.resource_set.resource_set_ipv4(rpki.resource_set.inherit_token),
+ v6 = rpki.resource_set.resource_set_ipv6(rpki.resource_set.inherit_token))
self.latest_manifest_cert = self.issue_ee(ca, resources, self.manifest_public_key)