[Opendnssec-commits] [svn.opendnssec.org/svn/dnssec] r6086 - home/jakob

jakob at kirei.se jakob at kirei.se
Mon Jan 23 22:36:20 CET 2012


Author: jakob
Date: 2012-01-23 22:36:20 +0100 (Mon, 23 Jan 2012)
New Revision: 6086

Modified:
   home/jakob/enforcerstate.rnc
Log:
more

Modified: home/jakob/enforcerstate.rnc
===================================================================
--- home/jakob/enforcerstate.rnc	2012-01-23 19:16:08 UTC (rev 6085)
+++ home/jakob/enforcerstate.rnc	2012-01-23 21:36:20 UTC (rev 6086)
@@ -27,6 +27,8 @@
 datatypes xsd = "http://www.w3.org/2001/XMLSchema-datatypes"
 
 start = element EnforcerState {
+	element Zones { zone+ },
+	element KeyPairs { keypair+ }
 }
 
 
@@ -44,7 +46,13 @@
 % );
 
 zone = element Zone {
-	element Keys { keys+ },
+	element Keys { key+ },
+	element NSEC3 {
+		element Salt { xsd:string },
+
+		% when was the Salt generated
+		element Generated { xsd:dateTime }?
+	}?
 }
 
 
@@ -68,7 +76,9 @@
 key = element Key {
 	attribute id { xsd:string },
 
+	% reference to KeyPair at id
 	element KeyPair { xsd:string },
+
 	element Type { "KSK" | "ZSK" | "CSK" },
 
 	element Publish { xsd:dateTime | empty },
@@ -108,16 +118,16 @@
 	element Identifier { xsd:string },
 
 	% under what policy was the key pair generated (if applicable)
-	element Policy { xsd:string | empty },
+	element Policy { xsd:string }?,
 
 	% when was the key originally generated
-	element Generated { xsd:dateTime },
+	element Generated { xsd:dateTime }?,
 	
 	% when was the key last backed up
-	element LastBackup { xsd:dateTime },
+	element LastBackup { xsd:dateTime }?,
 
-	% base64 encoded public key
-	element PublicKey { xsd:string | empty },
+	% PEM encoded public key
+	element PublicKey { xsd:string }?,
 
 	% is the key compromised?
 	element Compromised { empty }?




More information about the Opendnssec-commits mailing list