regen

svn path=/scripts/biz-certs/Bob-CA.srl; revision=1373

5 files changed, 44 insertions, 4 deletions

diff --git a/scripts/biz-certs/Bob-CA.srl b/scripts/biz-certs/Bob-CA.srl
index bded091f..65a08007 100644
--- a/scripts/biz-certs/Bob-CA.srl
+++ b/scripts/biz-certs/Bob-CA.srl
@@ -1 +1 @@
-90801F1ED194551A
+90801F1ED1945520
diff --git a/scripts/left-right-protocol-samples/pdu.001.xml b/scripts/left-right-protocol-samples/pdu.001.xml
index e859c7ed..7d6b1bd5 100644
--- a/scripts/left-right-protocol-samples/pdu.001.xml
+++ b/scripts/left-right-protocol-samples/pdu.001.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="create" type="query">
+  <self action="create" type="query" tag="a000">
     <extension_preference name="name">Launcelot</extension_preference>
     <extension_preference name="quest">Holy Grail</extension_preference>
   </self>
diff --git a/scripts/left-right-protocol-samples/pdu.002.xml b/scripts/left-right-protocol-samples/pdu.002.xml
index 577f77f0..248adc19 100644
--- a/scripts/left-right-protocol-samples/pdu.002.xml
+++ b/scripts/left-right-protocol-samples/pdu.002.xml
@@ -1,5 +1,5 @@
 <?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="create" type="reply" self_id="42"/>
+  <self action="create" type="reply" tag="a000" self_id="42"/>
 </msg>
diff --git a/scripts/left-right-schema.rng b/scripts/left-right-schema.rng
index f3638762..2445ed55 100644
--- a/scripts/left-right-schema.rng
+++ b/scripts/left-right-schema.rng
@@ -30,6 +30,16 @@
       </zeroOrMore>
     </element>
   </start>
+  <!-- Tag attributes for bulk operations -->
+  <define name="tag">
+    <optional>
+      <attribute name="tag">
+        <data type="token">
+          <param name="maxLength">1024</param>
+        </data>
+      </attribute>
+    </optional>
+  </define>
   <!--
     Combinations of action and type attributes used in later definitions.
     The same patterns repeat in most of the elements in this protocol.
@@ -41,6 +51,7 @@
     <attribute name="type">
       <value>query</value>
     </attribute>
+    <ref name="tag"/>
   </define>
   <define name="ctl_sq">
     <attribute name="action">
@@ -49,6 +60,7 @@
     <attribute name="type">
       <value>query</value>
     </attribute>
+    <ref name="tag"/>
   </define>
   <define name="ctl_gq">
     <attribute name="action">
@@ -57,6 +69,7 @@
     <attribute name="type">
       <value>query</value>
     </attribute>
+    <ref name="tag"/>
   </define>
   <define name="ctl_lq">
     <attribute name="action">
@@ -65,6 +78,7 @@
     <attribute name="type">
       <value>query</value>
     </attribute>
+    <ref name="tag"/>
   </define>
   <define name="ctl_dq">
     <attribute name="action">
@@ -73,6 +87,7 @@
     <attribute name="type">
       <value>query</value>
     </attribute>
+    <ref name="tag"/>
   </define>
   <define name="ctl_cr">
     <attribute name="action">
@@ -81,6 +96,7 @@
     <attribute name="type">
       <value>reply</value>
     </attribute>
+    <ref name="tag"/>
   </define>
   <define name="ctl_sr">
     <attribute name="action">
@@ -89,6 +105,7 @@
     <attribute name="type">
       <value>reply</value>
     </attribute>
+    <ref name="tag"/>
   </define>
   <define name="ctl_gr">
     <attribute name="action">
@@ -97,6 +114,7 @@
     <attribute name="type">
       <value>reply</value>
     </attribute>
+    <ref name="tag"/>
   </define>
   <define name="ctl_lr">
     <attribute name="action">
@@ -105,6 +123,7 @@
     <attribute name="type">
       <value>reply</value>
     </attribute>
+    <ref name="tag"/>
   </define>
   <define name="ctl_dr">
     <attribute name="action">
@@ -113,6 +132,7 @@
     <attribute name="type">
       <value>reply</value>
     </attribute>
+    <ref name="tag"/>
   </define>
   <!-- Base64 encoded DER stuff -->
   <define name="base64">
diff --git a/scripts/rpki/relaxng.py b/scripts/rpki/relaxng.py
index 278e812d..48d4efbc 100644
--- a/scripts/rpki/relaxng.py
+++ b/scripts/rpki/relaxng.py
@@ -6,7 +6,7 @@ import lxml.etree
 ## Parsed RelaxNG left_right schema
 left_right = lxml.etree.RelaxNG(lxml.etree.fromstring('''<?xml version="1.0" encoding="UTF-8"?>
 <!--
-  $Id: left-right-schema.rng 1358 2007-12-04 18:10:24Z sra $
+  $Id: left-right-schema.rnc 1372 2007-12-12 13:34:15Z sra $
   
   RelaxNG (Compact Syntax) Schema for RPKI left-right protocol.
   
@@ -36,6 +36,16 @@ left_right = lxml.etree.RelaxNG(lxml.etree.fromstring('''<?xml version="1.0" enc
       </zeroOrMore>
     </element>
   </start>
+  <!-- Tag attributes for bulk operations -->
+  <define name="tag">
+    <optional>
+      <attribute name="tag">
+        <data type="token">
+          <param name="maxLength">1024</param>
+        </data>
+      </attribute>
+    </optional>
+  </define>
   <!--
     Combinations of action and type attributes used in later definitions.
     The same patterns repeat in most of the elements in this protocol.
@@ -47,6 +57,7 @@ left_right = lxml.etree.RelaxNG(lxml.etree.fromstring('''<?xml version="1.0" enc
     <attribute name="type">
       <value>query</value>
     </attribute>
+    <ref name="tag"/>
   </define>
   <define name="ctl_sq">
     <attribute name="action">
@@ -55,6 +66,7 @@ left_right = lxml.etree.RelaxNG(lxml.etree.fromstring('''<?xml version="1.0" enc
     <attribute name="type">
       <value>query</value>
     </attribute>
+    <ref name="tag"/>
   </define>
   <define name="ctl_gq">
     <attribute name="action">
@@ -63,6 +75,7 @@ left_right = lxml.etree.RelaxNG(lxml.etree.fromstring('''<?xml version="1.0" enc
     <attribute name="type">
       <value>query</value>
     </attribute>
+    <ref name="tag"/>
   </define>
   <define name="ctl_lq">
     <attribute name="action">
@@ -71,6 +84,7 @@ left_right = lxml.etree.RelaxNG(lxml.etree.fromstring('''<?xml version="1.0" enc
     <attribute name="type">
       <value>query</value>
     </attribute>
+    <ref name="tag"/>
   </define>
   <define name="ctl_dq">
     <attribute name="action">
@@ -79,6 +93,7 @@ left_right = lxml.etree.RelaxNG(lxml.etree.fromstring('''<?xml version="1.0" enc
     <attribute name="type">
       <value>query</value>
     </attribute>
+    <ref name="tag"/>
   </define>
   <define name="ctl_cr">
     <attribute name="action">
@@ -87,6 +102,7 @@ left_right = lxml.etree.RelaxNG(lxml.etree.fromstring('''<?xml version="1.0" enc
     <attribute name="type">
       <value>reply</value>
     </attribute>
+    <ref name="tag"/>
   </define>
   <define name="ctl_sr">
     <attribute name="action">
@@ -95,6 +111,7 @@ left_right = lxml.etree.RelaxNG(lxml.etree.fromstring('''<?xml version="1.0" enc
     <attribute name="type">
       <value>reply</value>
     </attribute>
+    <ref name="tag"/>
   </define>
   <define name="ctl_gr">
     <attribute name="action">
@@ -103,6 +120,7 @@ left_right = lxml.etree.RelaxNG(lxml.etree.fromstring('''<?xml version="1.0" enc
     <attribute name="type">
       <value>reply</value>
     </attribute>
+    <ref name="tag"/>
   </define>
   <define name="ctl_lr">
     <attribute name="action">
@@ -111,6 +129,7 @@ left_right = lxml.etree.RelaxNG(lxml.etree.fromstring('''<?xml version="1.0" enc
     <attribute name="type">
       <value>reply</value>
     </attribute>
+    <ref name="tag"/>
   </define>
   <define name="ctl_dr">
     <attribute name="action">
@@ -119,6 +138,7 @@ left_right = lxml.etree.RelaxNG(lxml.etree.fromstring('''<?xml version="1.0" enc
     <attribute name="type">
       <value>reply</value>
     </attribute>
+    <ref name="tag"/>
   </define>
   <!-- Base64 encoded DER stuff -->
   <define name="base64">