diff options
| author | Rob Austein <sra@hactrn.net> | 2009-09-23 13:19:55 +0000 |
|---|---|---|
| committer | Rob Austein <sra@hactrn.net> | 2009-09-23 13:19:55 +0000 |
| commit | 6d81562d626b24706f2354ded65ff9c536271f52 (patch) | |
| tree | 7ca78686504247b4db00963c1ae2b99deaa530f7 /rpkid/rpki/relaxng.py | |
| parent | 4d163f646207005fd51878e66b4af39b9a113880 (diff) | |
Collapse HTTPS and CMS BPKI certs for pubd, separation not needed
svn path=/myrpki/myirbe.py; revision=2781
Diffstat (limited to 'rpkid/rpki/relaxng.py')
| -rw-r--r-- | rpkid/rpki/relaxng.py | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/rpkid/rpki/relaxng.py b/rpkid/rpki/relaxng.py index 71cfc345..7e2d1037 100644 --- a/rpkid/rpki/relaxng.py +++ b/rpkid/rpki/relaxng.py @@ -705,22 +705,12 @@ left_right = lxml.etree.RelaxNG(lxml.etree.fromstring('''<?xml version="1.0" enc <ref name="bsc_handle"/> </optional> <optional> - <element name="bpki_cms_cert"> - <ref name="base64"/> - </element> - </optional> - <optional> - <element name="bpki_cms_glue"> - <ref name="base64"/> - </element> - </optional> - <optional> - <element name="bpki_https_cert"> + <element name="bpki_cert"> <ref name="base64"/> </element> </optional> <optional> - <element name="bpki_https_glue"> + <element name="bpki_glue"> <ref name="base64"/> </element> </optional> |