From 2ae55cb29667344e43ef58737680421d06d90e65 Mon Sep 17 00:00:00 2001
From: Rob Austein <sra@hactrn.net>
Date: Thu, 4 Oct 2007 03:06:25 +0000
Subject: Rename *.peer_ta => *.cms_ta, add parent.https_ta and
 repository.https_ta.

svn path=/docs/left-right-xml; revision=1088
---
 scripts/rpki/relaxng.py | 25 ++++++++++++++++++-------
 1 file changed, 18 insertions(+), 7 deletions(-)

(limited to 'scripts/rpki/relaxng.py')

diff --git a/scripts/rpki/relaxng.py b/scripts/rpki/relaxng.py
index 8a5817d0..aacae01a 100644
--- a/scripts/rpki/relaxng.py
+++ b/scripts/rpki/relaxng.py
@@ -4,7 +4,7 @@ import lxml.etree
 
 left_right = lxml.etree.RelaxNG(lxml.etree.fromstring('''<?xml version="1.0" encoding="UTF-8"?>
 <!--
-  $Id: left-right-schema.rng 1067 2007-10-01 20:22:57Z sra $
+  $Id: left-right-schema.rnc 1067 2007-10-01 20:22:57Z sra $
   
   RelaxNG (Compact Syntax) Schema for RPKI left-right protocol.
   
@@ -124,9 +124,14 @@ left_right = lxml.etree.RelaxNG(lxml.etree.fromstring('''<?xml version="1.0" enc
       <param name="maxLength">512000</param>
     </data>
   </define>
-  <!-- How we wrap peer_ta fields (separate element or inline?) -->
-  <define name="peer_ta">
-    <element name="peer_ta">
+  <!-- How we wrap trust anchor elements -->
+  <define name="cms_ta">
+    <element name="cms_ta">
+      <ref name="base64"/>
+    </element>
+  </define>
+  <define name="https_ta">
+    <element name="https_ta">
       <ref name="base64"/>
     </element>
   </define>
@@ -433,7 +438,10 @@ left_right = lxml.etree.RelaxNG(lxml.etree.fromstring('''<?xml version="1.0" enc
       </attribute>
     </optional>
     <optional>
-      <ref name="peer_ta"/>
+      <ref name="cms_ta"/>
+    </optional>
+    <optional>
+      <ref name="https_ta"/>
     </optional>
   </define>
   <define name="parent_elt" combine="choice">
@@ -532,7 +540,7 @@ left_right = lxml.etree.RelaxNG(lxml.etree.fromstring('''<?xml version="1.0" enc
       </attribute>
     </optional>
     <optional>
-      <ref name="peer_ta"/>
+      <ref name="cms_ta"/>
     </optional>
   </define>
   <define name="child_elt" combine="choice">
@@ -631,7 +639,10 @@ left_right = lxml.etree.RelaxNG(lxml.etree.fromstring('''<?xml version="1.0" enc
       </attribute>
     </optional>
     <optional>
-      <ref name="peer_ta"/>
+      <ref name="cms_ta"/>
+    </optional>
+    <optional>
+      <ref name="https_ta"/>
     </optional>
   </define>
   <define name="repository_elt" combine="choice">
-- 
cgit v1.2.3