diff options
| author | Rob Austein <sra@hactrn.net> | 2008-01-09 16:21:12 +0000 |
|---|---|---|
| committer | Rob Austein <sra@hactrn.net> | 2008-01-09 16:21:12 +0000 |
| commit | 413a6ecf9cddcbee4b9499da1d0255500fa96134 (patch) | |
| tree | 90cb5c23eaeff633bfbe3cba16c5055d0c664c6f | |
| parent | f31bc61dcb3f6a4c67ae8c644a11be1febaa06ad (diff) | |
cms-cert => cms-certs in rootd, for consistancy with rpkid
svn path=/scripts/rootd.py; revision=1456
| -rwxr-xr-x | scripts/rootd.py | 4 | ||||
| -rw-r--r-- | scripts/testbed.py | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/scripts/rootd.py b/scripts/rootd.py index bfb782dc..606ec160 100755 --- a/scripts/rootd.py +++ b/scripts/rootd.py @@ -156,10 +156,10 @@ cfg = rpki.config.parser(cfg_file, "rootd") cms_ta = rpki.x509.X509(Auto_file = cfg.get("cms-ta")) cms_key = rpki.x509.RSA(Auto_file = cfg.get("cms-key")) -cms_certs = rpki.x509.X509_chain(Auto_files = cfg.multiget("cms-cert")) +cms_certs = rpki.x509.X509_chain(Auto_files = cfg.multiget("cms-certs")) https_key = rpki.x509.RSA(Auto_file = cfg.get("https-key")) -https_certs = rpki.x509.X509_chain(Auto_files = cfg.multiget("https-cert")) +https_certs = rpki.x509.X509_chain(Auto_files = cfg.multiget("https-certs")) https_server_host = cfg.get("server-host", "") https_server_port = int(cfg.get("server-port")) diff --git a/scripts/testbed.py b/scripts/testbed.py index fc2b6c8b..12e6f36a 100644 --- a/scripts/testbed.py +++ b/scripts/testbed.py @@ -724,13 +724,13 @@ rootd_fmt_1 = '''\ [rootd] cms-key = %(rootd_name)s-EE.key -cms-cert.0 = %(rootd_name)s-EE.cer -cms-cert.1 = %(rootd_name)s-CA.cer +cms-certs.0 = %(rootd_name)s-EE.cer +cms-certs.1 = %(rootd_name)s-CA.cer cms-ta = %(rpkid_name)s-RPKI-TA.cer https-key = %(rootd_name)s-EE.key -https-cert.0 = %(rootd_name)s-EE.cer -https-cert.1 = %(rootd_name)s-CA.cer +https-certs.0 = %(rootd_name)s-EE.cer +https-certs.1 = %(rootd_name)s-CA.cer server-port = %(rootd_port)s |