Re-arranged the encryption data

This commit is contained in:
Martin Gallwey
2001-05-08 12:47:43 +00:00
parent ae8344680f
commit 1a494cc88a

View File

@@ -1,5 +1,5 @@
<!--
$Id: Manifest.dtd,v 1.6 2001-04-27 14:56:04 mtg Exp $
$Id: Manifest.dtd,v 1.7 2001-05-08 13:47:43 mtg Exp $
The Contents of this file are made available subject to the terms of
either of the following licenses
@@ -54,15 +54,29 @@
-->
<!ELEMENT manifest:manifest (manifest:file-entry+)>
<!ATTLIST manifest:manifest xmlns:manifest CDATA #FIXED "http://openoffice.org/2001/manifest">
<!ELEMENT manifest:file-entry (manifest:encryption-data?)>
<!-- manifest:size is usually only specified for encrypted entries -->
<!ATTLIST manifest:file-entry
manifest:full-path CDATA #REQUIRED
manifest:size CDATA #IMPLIED
manifest:media-type CDATA #REQUIRED
>
<!ELEMENT manifest:encryption-data (manifest:initialisation-vector?)>
<!ATTLIST manifest:encryption-data
manifest:algorithm CDATA #REQUIRED
<!ELEMENT manifest:encryption-data (manifest:algorithm,manifest:key-derivation)>
<!-- algorithm-name specifies the name of the algorithm used to encrypt
the stream, for example Blowfish
manifest:initialisation-vector is stored encoded in Base64 -->
<!ELEMENT manifest:algorithm EMPTY>
<!ATTLIST manifest:algorithm
manifest:algorithm-name CDATA #REQUIRED
manifest:initialisation-vector CDATA #REQUIRED>
<!ELEMENT manifest:key-derivation EMPTY>
<!-- manifest:key-derivation-name specifies the name of the algorithm used to derive
the key, for example PBKDF2 (see rfc 2898 )
manifest:salt is stored encoded in Base64 -->
<!ATTLIST manifest:key-derivation
manifest:key-derivation-name CDATA #REQUIRED
manifest:salt CDATA #REQUIRED
manifest:iteration-count CDATA #REQUIRED>
<!-- the initialisation-vector should be base-64 encoded -->
<!ELEMENT manifest:initialisation-vector (#PCDATA)>