4 files changed, 25 insertions, 7 deletions
diff --git a/scripts/left-right-protocol-samples/pdu.003.xml b/scripts/left-right-protocol-samples/pdu.003.xml
index 7fd4784e..b53bb031 100644
--- a/scripts/left-right-protocol-samples/pdu.003.xml
+++ b/scripts/left-right-protocol-samples/pdu.003.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="US-ASCII"?>
 <!--Automatically generated, do not edit.-->
 <msg xmlns="http://www.hactrn.net/uris/rpki/left-right-spec/" version="1">
-  <self action="set" type="query" self_id="42" rekey="yes" reissue="yes" revoke="yes" run_now="yes" publish_world_now="yes" clear_extension_preferences="yes">
+  <self action="set" type="query" self_id="42" rekey="yes" reissue="yes" revoke="yes" run_now="yes" publish_world_now="yes" clear_extension_preferences="yes" crl_interval="3600" use_hsm="no">
     <extension_preference name="color">Blue</extension_preference>
   </self>
 </msg>
diff --git a/scripts/left-right-schema.rnc b/scripts/left-right-schema.rnc
index 31c6348c..b25ebc09 100644
--- a/scripts/left-right-schema.rnc
+++ b/scripts/left-right-schema.rnc
@@ -48,10 +48,12 @@ self_bool = (attribute rekey { "yes" }?,
              attribute publish_world_now { "yes" }?,
              attribute clear_extension_preferences { "yes" }?)
 
-self_payload = element extension_preference {
-  attribute name { xsd:token { maxLength="1024" } },
-  xsd:string { maxLength="512000" }
-}*
+self_payload = (attribute use_hsm { "yes" | "no" }?,
+		attribute crl_interval { xsd:token { maxLength="1024" } }?,
+		element extension_preference {
+  		  attribute name { xsd:token { maxLength="1024" } },
+		  xsd:string { maxLength="512000" }
+		}*)
 
 self_id = attribute self_id { sql_id }
 
diff --git a/scripts/left-right-schema.rng b/scripts/left-right-schema.rng
index 7bf0de92..b33c8e28 100644
--- a/scripts/left-right-schema.rng
+++ b/scripts/left-right-schema.rng
@@ -171,6 +171,21 @@
     </optional>
   </define>
   <define name="self_payload">
+    <optional>
+      <attribute name="use_hsm">
+        <choice>
+          <value>yes</value>
+          <value>no</value>
+        </choice>
+      </attribute>
+    </optional>
+    <optional>
+      <attribute name="crl_interval">
+        <data type="token">
+          <param name="maxLength">1024</param>
+        </data>
+      </attribute>
+    </optional>
     <zeroOrMore>
       <element name="extension_preference">
         <attribute name="name">
diff --git a/scripts/rpki/left_right.py b/scripts/rpki/left_right.py
index 983f2da1..181a1d13 100644
--- a/scripts/rpki/left_right.py
+++ b/scripts/rpki/left_right.py
@@ -193,14 +193,15 @@ class self_elt(data_elt):
   """<self/> element."""
 
   element_name = "self"
-  attributes = ("action", "type", "self_id")
+  attributes = ("action", "type", "self_id", "crl_interval")
   elements = ("extension_preference",)
   booleans = ("rekey", "reissue", "revoke", "run_now", "publish_world_now", "clear_extension_preferences")
 
-  sql_template = rpki.sql.template("self", "self_id", "use_hsm")
+  sql_template = rpki.sql.template("self", "self_id", "use_hsm", "crl_interval")
 
   self_id = None
   use_hsm = False
+  crl_interval = None
 
   def __init__(self):
     """Initialize a self_elt."""