diff options
| author | Rob Austein <sra@hactrn.net> | 2009-06-17 02:37:39 +0000 |
|---|---|---|
| committer | Rob Austein <sra@hactrn.net> | 2009-06-17 02:37:39 +0000 |
| commit | d0c669ee3787d1ac556e0047321270332ea6b0f8 (patch) | |
| tree | f93640aa907c3acc6bdf5b559e1cbe75ddd2323f | |
| parent | 6e8146c026b544c629fbe6cb0f1e4caa6e983307 (diff) | |
Checkpoint
svn path=/myrpki/myrpki.conf; revision=2531
| -rw-r--r-- | myrpki/myrpki.conf | 3 | ||||
| -rw-r--r-- | myrpki/myrpki.py | 6 |
2 files changed, 7 insertions, 2 deletions
diff --git a/myrpki/myrpki.conf b/myrpki/myrpki.conf index d35f4f1a..473042fa 100644 --- a/myrpki/myrpki.conf +++ b/myrpki/myrpki.conf @@ -17,7 +17,8 @@ bpki_ca_key = bpki-ca-key.pem bpki_ee_certificate = bpki-ee-cert.pem bpki_ee_pkcs10 = bpki-ee-pkcs10.pem -output-filename = myrpki.xml +output_filename = myrpki.xml +relaxng_schema = myrpki.rng [req] default_bits = 2048 diff --git a/myrpki/myrpki.py b/myrpki/myrpki.py index 2dd562f5..4c5df830 100644 --- a/myrpki/myrpki.py +++ b/myrpki/myrpki.py @@ -43,7 +43,8 @@ bpki_ca_cert_file = cfg.get(myrpki_section, "bpki_ca_certificate") bpki_ca_key_file = cfg.get(myrpki_section, "bpki_ca_key") bpki_ee_cert_file = cfg.get(myrpki_section, "bpki_ee_certificate") bpki_ee_req_file = cfg.get(myrpki_section, "bpki_ee_pkcs10") -output_filename = cfg.get(myrpki_section, "output-filename") +output_filename = cfg.get(myrpki_section, "output_filename") +relaxng_schema = cfg.get(myrpki_section, "relaxng_schema") v4regexp = re.compile("^[-0-9./]+$", re.I) v6regexp = re.compile("^[-0-9a-f:/]+$", re.I) @@ -193,3 +194,6 @@ bpki_ee(e) ElementTree(e).write(output_filename + ".tmp") os.rename(output_filename + ".tmp", output_filename) + +subprocess.check_call(("xmllint", "-relaxng", relaxng_schema, + "-noout", output_filename)) |