From 3d7748a4283d6bcc89f373307a6dba967f7faf32 Mon Sep 17 00:00:00 2001 From: Rob Austein Date: Wed, 10 Nov 2010 04:12:22 +0000 Subject: Fix handling of inheritance in EE certs svn path=/rpkid/rootd.py; revision=3544 --- rpkid/rootd.py | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'rpkid/rootd.py') diff --git a/rpkid/rootd.py b/rpkid/rootd.py index 1b0115b0..ac38d76d 100644 --- a/rpkid/rootd.py +++ b/rpkid/rootd.py @@ -143,10 +143,7 @@ def issue_subject_cert_maybe(new_pkcs10): f = open(rpki_root_dir + rpki_root_crl, "wb") f.write(crl.get_DER()) f.close() - manifest_resources = rpki.resource_set.resource_bag( - 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_resources = rpki.resource_set.resource_bag.from_inheritance() manifest_keypair = rpki.x509.RSA.generate() manifest_cert = rpki_root_cert.issue( keypair = rpki_root_key, -- cgit v1.2.3