diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2012-05-28 11:43:09 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2012-06-02 08:28:19 +0100 |
| commit | 4a7164429b727bd8fd6f183950e85e6225869364 (patch) | |
| tree | b96bc09cfe092cf51231ed83f0a446e4e4db3faf /package/inc | |
| parent | 6bd0f40d346a36d8b3d454fd0cf087d1ca126ee4 (diff) | |
count and order of receipt of properties doesn't matter
so stick imported properties into assigned slots and throw out empty ones when
finished. Reuse existing ids for this between import and export. Shuffle
FULLPATH to 0 as per import comment
Change-Id: I516116c5327498ad043f6e2fb9bd257599ade2a2
Diffstat (limited to 'package/inc')
| -rw-r--r-- | package/inc/PackageConstants.hxx | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/package/inc/PackageConstants.hxx b/package/inc/PackageConstants.hxx index be82010175fc..7590acd951da 100644 --- a/package/inc/PackageConstants.hxx +++ b/package/inc/PackageConstants.hxx @@ -40,19 +40,19 @@ const sal_Int32 n_ConstDigestLength = 1024; const sal_Int32 n_ConstDigestDecrypt = 1056; // 1024 + 32 // the constants related to the manifest.xml entries -#define PKG_MNFST_MEDIATYPE 0 -#define PKG_MNFST_VERSION 1 -#define PKG_MNFST_FULLPATH 2 +#define PKG_MNFST_FULLPATH 0 //FullPath (Put full-path property first for MBA) +#define PKG_MNFST_VERSION 1 //Version +#define PKG_MNFST_MEDIATYPE 2 //MediaType -#define PKG_MNFST_INIVECTOR 3 -#define PKG_MNFST_SALT 4 -#define PKG_MNFST_ITERATION 5 -#define PKG_MNFST_UCOMPSIZE 6 -#define PKG_MNFST_DIGEST 7 -#define PKG_MNFST_ENCALG 8 -#define PKG_MNFST_STARTALG 9 -#define PKG_MNFST_DIGESTALG 10 -#define PKG_MNFST_DERKEYSIZE 11 +#define PKG_MNFST_INIVECTOR 3 //InitialisationVector +#define PKG_MNFST_SALT 4 //Salt +#define PKG_MNFST_ITERATION 5 //IterationCount +#define PKG_MNFST_UCOMPSIZE 6 //Size +#define PKG_MNFST_DIGEST 7 //Digest +#define PKG_MNFST_ENCALG 8 //EncryptionAlgorithm +#define PKG_MNFST_STARTALG 9 //StartKeyAlgorithm +#define PKG_MNFST_DIGESTALG 10 //DigestAlgorithm +#define PKG_MNFST_DERKEYSIZE 11 //DerivedKeySize #define PKG_SIZE_NOENCR_MNFST 3 #define PKG_SIZE_ENCR_MNFST 12 |