[PATCH] gpg4libre: ODF schema proposal

[Thorsten Behrens <Thorsten.Behrens@CIB.de>]

Change-Id: Id20cd3525ec27c62f49a535112219aeefc9b7987
---
 .../odf1.3/OpenDocument-manifest-schema-v1.3.rng   | 46 ++++++++++++++++++++++
 1 file changed, 46 insertions(+)

diff --git a/schema/odf1.3/OpenDocument-manifest-schema-v1.3.rng b/schema/odf1.3/OpenDocument-manifest-schema-v1.3.rng
index f485ffbd019c..ba3c49b087f1 100644
--- a/schema/odf1.3/OpenDocument-manifest-schema-v1.3.rng
+++ b/schema/odf1.3/OpenDocument-manifest-schema-v1.3.rng
@@ -81,6 +81,32 @@
   <rng:define name="base64Binary">
     <rng:data type="base64Binary"/>
   </rng:define>
+  <rng:define name="encryptedkey">
+    <rng:element name="manifest:encrypted-key">
+      <rng:element name="manifest:encryption-method">
+        <rng:attribute name="manifest:algorithm">
+          <rng:ref name="anyURI"/>
+        </rng:attribute>
+      </rng:element>
+      <rng:element name="manifest:KeyInfo">
+        <rng:element name="manifest:PGPData">
+          <rng:element name="manifest:PGPKeyID">
+            <rng:ref name="base64Binary"/>
+          </rng:element>
+          <rng:optional>
+            <rng:element name="manifest:PGPKeyPacket">
+              <rng:ref name="base64Binary"/>
+            </rng:element>
+          </rng:optional>
+        </rng:element>
+      </rng:element>
+      <rng:element name="manifest:CipherData">
+        <rng:element name="manifest:CipherValue">
+          <rng:ref name="base64Binary"/>
+        </rng:element>
+      </rng:element>
+    </rng:element>
+  </rng:define>
   <rng:define name="encryption-data">
     <rng:element name="manifest:encryption-data">
       <rng:ref name="encryption-data-attlist"/>
@@ -104,6 +130,19 @@
       </rng:attribute>
     </rng:interleave>
   </rng:define>
+  <rng:define name="encryptionmethod">
+    <rng:interleave>
+      <rng:attribute name="manifest:encryption-method">
+        <rng:choice>
+          <rng:value>SHA1/1K</rng:value>
+          <rng:ref name="anyURI"/>
+        </rng:choice>
+      </rng:attribute>
+      <rng:attribute name="manifest:checksum">
+        <rng:ref name="base64Binary"/>
+      </rng:attribute>
+    </rng:interleave>
+  </rng:define>
   <rng:define name="file-entry">
     <rng:element name="manifest:file-entry">
       <rng:ref name="file-entry-attlist"/>
@@ -169,6 +208,13 @@
       </rng:optional>
     </rng:interleave>
   </rng:define>
+  <rng:define name="keyinfo">
+    <rng:element name="manifest:keyinfo">
+      <rng:oneOrMore>
+        <rng:ref name="encryptedkey"/>
+      </rng:oneOrMore>
+    </rng:element>
+  </rng:define>
   <rng:define name="manifest">
     <rng:element name="manifest:manifest">
       <rng:ref name="manifest-attlist"/>
-- 
2.12.3

</pre>


was (Author: thorsten.behrens):
Here's a schema diff, covering the proposed changes in markup: