4 files changed, 30 insertions, 4 deletions
diff --git a/myrpki/myrpki.py b/myrpki/myrpki.py
index d6841041..79fb6239 100644
--- a/myrpki/myrpki.py
+++ b/myrpki/myrpki.py
@@ -158,7 +158,7 @@ def bpki_ca(e, bpki_ca_key_file, bpki_ca_cert_file, cfg_file):
 
   PEMElement(e, "bpki_ca_certificate", bpki_ca_cert_file)
 
-def bpki_ee(e, bpki_ee_req_file, bpki_ee_cert_file):
+def bpki_ee(e, bpki_ee_req_file, bpki_ee_cert_file, bpki_ca_cert_file, bpki_ca_key_file):
 
   if os.path.exists(bpki_ee_req_file):
 
@@ -172,6 +172,9 @@ def bpki_ee(e, bpki_ee_req_file, bpki_ee_cert_file):
 
     PEMElement(e, "bpki_ee_certificate", bpki_ee_cert_file)
 
+def bpki_crl(e):
+  pass
+
 def extract_resources():
   pass
 
@@ -211,8 +214,16 @@ def main():
   e = Element("myrpki", xmlns = namespace, version = "1", handle = my_handle)
   roas.xml(e)
   kids.xml(e)
-  bpki_ca(e, bpki_ca_key_file, bpki_ca_cert_file, cfg_file)
-  bpki_ee(e, bpki_ee_req_file, bpki_ee_cert_file)
+  bpki_ca(e,
+          bpki_ca_key_file  = bpki_ca_key_file,
+          bpki_ca_cert_file = bpki_ca_cert_file,
+          cfg_file          = cfg_file)
+  bpki_ee(e,
+          bpki_ee_req_file  = bpki_ee_req_file,
+          bpki_ee_cert_file = bpki_ee_cert_file,
+          bpki_ca_cert_file = bpki_ca_cert_file,
+          bpki_ca_key_file  = bpki_ca_key_file)
+  bpki_crl(e)
 
   ElementTree(e).write(output_filename + ".tmp")
   os.rename(output_filename + ".tmp", output_filename)
diff --git a/myrpki/myrpki.rnc b/myrpki/myrpki.rnc
index 845daa8f..88e60ef7 100644
--- a/myrpki/myrpki.rnc
+++ b/myrpki/myrpki.rnc
@@ -20,7 +20,8 @@ start = element myrpki {
   roa_request*,
   child*,
   bpki_ca_certificate?,
-  bpki_ee_certificate?
+  bpki_ee_certificate?,
+  bpki_crl?
 }
 
 roa_request = element roa_request {
@@ -41,6 +42,8 @@ bpki_ca_certificate = element bpki_ca_certificate { base64 }
 
 bpki_ee_certificate = element bpki_ee_certificate { base64 }
 
+bpki_crl            = element bpki_crl            { base64 }
+
 # Local Variables:
 # indent-tabs-mode: nil
 # End:
diff --git a/myrpki/myrpki.rng b/myrpki/myrpki.rng
index c9bae70b..1ccdc94e 100644
--- a/myrpki/myrpki.rng
+++ b/myrpki/myrpki.rng
@@ -64,6 +64,9 @@
       <optional>
         <ref name="bpki_ee_certificate"/>
       </optional>
+      <optional>
+        <ref name="bpki_crl"/>
+      </optional>
     </element>
   </start>
   <define name="roa_request">
@@ -116,6 +119,11 @@
       <ref name="base64"/>
     </element>
   </define>
+  <define name="bpki_crl">
+    <element name="bpki_crl">
+      <ref name="base64"/>
+    </element>
+  </define>
 </grammar>
 <!--
   Local Variables:
diff --git a/myrpki/xml-parse-test.py b/myrpki/xml-parse-test.py
index 6fb9b583..862289ef 100755
--- a/myrpki/xml-parse-test.py
+++ b/myrpki/xml-parse-test.py
@@ -46,3 +46,7 @@ if ca:
 ee = tree.findtext(tag("bpki_ee_certificate"))
 if ee:
   print "EE certificate:", ee
+
+crl = tree.findtext(tag("bpki_crl"))
+if crl:
+  print "CRL:", crl