diff options
| author | Rob Austein <sra@hactrn.net> | 2009-07-15 05:22:35 +0000 |
|---|---|---|
| committer | Rob Austein <sra@hactrn.net> | 2009-07-15 05:22:35 +0000 |
| commit | c08f6414e70bf5c33924c7663f19762257b5a27f (patch) | |
| tree | 99f300d77867fb8faff65ecf389b90c0b848785e | |
| parent | 3cbcdf39320dd713dd308729572d9fca3613e607 (diff) | |
Checkpoint
svn path=/myrpki/yaml-to-myrpki.py; revision=2623
| -rw-r--r-- | myrpki/yaml-to-myrpki.py | 15 | ||||
| -rw-r--r-- | rpkid/rpki/x509.py | 2 |
2 files changed, 8 insertions, 9 deletions
diff --git a/myrpki/yaml-to-myrpki.py b/myrpki/yaml-to-myrpki.py index 276e0330..c9c9bb14 100644 --- a/myrpki/yaml-to-myrpki.py +++ b/myrpki/yaml-to-myrpki.py @@ -212,11 +212,8 @@ class allocation(object): return open(path, "w") def up_down_url(self): - if self.is_root(): - return "https://localhost:%d/" % self.rootd_port - else: - parent_port = self.parent.hosted_by.rpkid_port if self.parent.is_hosted() else self.parent.rpkid_port - return "https://localhost:%d/up-down/%s/%s" % (parent_port, self.parent.name, self.name) + parent_port = self.parent.hosted_by.rpkid_port if self.parent.is_hosted() else self.parent.rpkid_port + return "https://localhost:%d/up-down/%s/%s" % (parent_port, self.parent.name, self.name) def dump_asns(self, fn): f = self.outfile(fn) @@ -228,13 +225,15 @@ class allocation(object): def dump_children(self, fn): f = self.outfile(fn) for k in self.kids: - f.write("%s\t%s\t%s\n" % (k.name, k.resources.valid_until, k.path("bpki.myrpki", "ca.cer"))) + f.write("%s\t%s\t%s\n" % (k.name, k.resources.valid_until, k.path("bpki.myrpki/ca.cer"))) f.close() def dump_parents(self, fn): f = self.outfile(fn) - if not self.is_root(): - f.write("%s\t%s\t%s\n" % (self.parent.name, self.up_down_url(), self.parent.path("bpki.myrpki", "ca.cer"))) + if self.is_root(): + f.write("%s\t%s\t%s\n" % ("rootd", "https://localhost:%d/" % self.rootd_port, self.path("bpki.rootd/ca.cer"))) + else: + f.write("%s\t%s\t%s\n" % (self.parent.name, self.up_down_url(), self.parent.path("bpki.myrpki/ca.cer"))) f.close() def dump_prefixes(self, fn): diff --git a/rpkid/rpki/x509.py b/rpkid/rpki/x509.py index 540209d0..bb238f46 100644 --- a/rpkid/rpki/x509.py +++ b/rpkid/rpki/x509.py @@ -725,7 +725,7 @@ class CMS_object(DER_object): ## @var debug_cms_certs # Set this to True to log a lot of chatter about CMS certificates. - debug_cms_certs = False + debug_cms_certs = True ## @var require_crls # Set this to False to make CMS CRLs optional in the cases where we |