Cleanup

svn path=/myrpki.rototill/myrpki.rnc; revision=3086

1 files changed, 28 insertions, 35 deletions

diff --git a/myrpki.rototill/myrpki.rnc b/myrpki.rototill/myrpki.rnc
index c076369e..c5cfa348 100644
--- a/myrpki.rototill/myrpki.rnc
+++ b/myrpki.rototill/myrpki.rnc
@@ -13,28 +13,34 @@ base64		= xsd:base64Binary { maxLength="512000" }
 object_handle	= xsd:string { maxLength="255" pattern="[\-_A-Za-z0-9]*" }
 pubd_handle     = xsd:string { maxLength="255" pattern="[\-_A-Za-z0-9/]*" }
 uri		= xsd:anyURI { maxLength="4096" }
+asn             = xsd:positiveInteger
 asn_list	= xsd:string { maxLength="512000" pattern="[\-,0-9]*" }
 ipv4_list	= xsd:string { maxLength="512000" pattern="[\-,0-9/.]*" }
 ipv6_list	= xsd:string { maxLength="512000" pattern="[\-,0-9/:a-fA-F]*" }
+timestamp       = xsd:dateTime { pattern=".*Z" }
 
-start |= myrpki_pdu
-start |= identity_pdu
-start |= parent_pdu
-start |= repository_pdu
-start |= referral_pdu
+authorization = element authorization {
+  attribute referrer { pubd_handle },
+  base64
+}
+
+contact_info = element contact_info {
+  attribute uri { uri }?,
+  xsd:string
+}
 
-myrpki_pdu = element myrpki {
+start |= element myrpki {
   attribute version { version },
   attribute handle { object_handle },
   attribute service_uri { uri }?,
   element roa_request {
-    attribute asn { xsd:positiveInteger },
+    attribute asn { asn },
     attribute v4 { ipv4_list },
     attribute v6 { ipv6_list }
   }*,
   element child {
     attribute handle { object_handle },
-    attribute valid_until { xsd:dateTime { pattern=".*Z" } },
+    attribute valid_until { timestamp },
     attribute asns { asn_list }?,
     attribute v4 { ipv4_list }?,
     attribute v6 { ipv6_list }?,
@@ -60,15 +66,15 @@ myrpki_pdu = element myrpki {
   element bpki_server_ta { base64 }?
 }
 
-identity_pdu = element identity {
+start |= element identity {
   attribute version { version },
   attribute handle { object_handle },
   element bpki_ta { base64 }
 }
 
-parent_pdu = element parent {
+start |= element parent {
   attribute version { version },
-  attribute valid_until { xsd:dateTime { pattern=".*Z" } },
+  attribute valid_until { timestamp },
   attribute service_uri { uri }?,
   attribute child_handle { object_handle },
   attribute parent_handle { object_handle },
@@ -77,11 +83,11 @@ parent_pdu = element parent {
   element bpki_child_ta { base64 },
   element repository {
     ((attribute type { "offer" }) |
-     (attribute type { "referral" }, authorization_elt, contact_info_elt))
+     (attribute type { "referral" }, authorization, contact_info))
   }?
 }
 
-repository_pdu |= element repository {
+start |= element repository {
   attribute version { version },
   attribute type { "confirmed" },
   attribute parent_handle { object_handle },
@@ -91,23 +97,20 @@ repository_pdu |= element repository {
   attribute repository_handle { object_handle },
   element bpki_server_ta { base64 },
   element bpki_client_ta { base64 },
-  element contact_info { xsd:string }?
+  contact_info?
 }
 
-repository_pdu |= element repository {
+start |= element repository {
   attribute version { version },
   attribute type { "request" },
   attribute handle { object_handle },
   attribute parent_handle { object_handle },
   element bpki_ta { base64 },
-  element contact_info { xsd:string }?,
-  element authorization {
-    attribute referrer { pubd_handle },
-    base64
-  }?
+  authorization?,
+  contact_info?
 }
 
-repository_pdu |= element repository {
+start |= element repository {
   attribute version { version },
   attribute type { "offer" },
   attribute handle { object_handle },
@@ -115,32 +118,22 @@ repository_pdu |= element repository {
   element bpki_ta { base64 }
 }
 
-repository_pdu |= element repository {
+start |= element repository {
   attribute version { version },
   attribute type { "referral" },
   attribute handle { object_handle },
   attribute parent_handle { object_handle },
-  authorization_elt,
-  contact_info_elt?,
+  authorization,
+  contact_info?,
   element bpki_ta { base64 }
 }
 
-referral_pdu = element referral {
+start |= element referral {
   attribute version { version },
   attribute authorized_sia_base { uri },
   base64
 }
 
-authorization_elt = element authorization {
-  attribute referrer { pubd_handle },
-  base64
-}
-
-contact_info_elt = element contact_info {
-  attribute uri { uri }?,
-  xsd:string
-}
-
 # Local Variables:
 # indent-tabs-mode: nil
 # End: