diff options
| author | Philipp Hofer <philipp.hofer@protonmail.com> | 2020-11-12 13:09:45 +0100 |
|---|---|---|
| committer | Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> | 2020-11-19 19:23:33 +0100 |
| commit | eb4c2e96f38a6b5280a83709e55fbb5b8d7e9d36 (patch) | |
| tree | a1a8ab31f7869b5b2d32629323e6f98074676622 /package/inc | |
| parent | 4d4e95be173e84b5040af46a459b3c071bfd744a (diff) | |
tdf#123936 Formatting files in module package with clang-format
Change-Id: I3ff80c6c636003d468f384e0d6fbfb5233e0b4da
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105696
Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
Tested-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
Diffstat (limited to 'package/inc')
| -rw-r--r-- | package/inc/EncryptedDataHeader.hxx | 3 | ||||
| -rw-r--r-- | package/inc/PackageConstants.hxx | 26 | ||||
| -rw-r--r-- | package/inc/ZipEnumeration.hxx | 7 |
3 files changed, 19 insertions, 17 deletions
diff --git a/package/inc/EncryptedDataHeader.hxx b/package/inc/EncryptedDataHeader.hxx index 26d8e62d02db..6860c50abb48 100644 --- a/package/inc/EncryptedDataHeader.hxx +++ b/package/inc/EncryptedDataHeader.hxx @@ -42,7 +42,8 @@ */ const sal_uInt32 n_ConstHeader = 0x05024d4dL; // "MM\002\005" -const sal_Int32 n_ConstHeaderSize = 38; // + salt length + iv length + digest length + mediatype length +const sal_Int32 n_ConstHeaderSize + = 38; // + salt length + iv length + digest length + mediatype length const sal_Int16 n_ConstCurrentVersion = 1; #endif diff --git a/package/inc/PackageConstants.hxx b/package/inc/PackageConstants.hxx index b81c0dd0a904..141da220ec69 100644 --- a/package/inc/PackageConstants.hxx +++ b/package/inc/PackageConstants.hxx @@ -30,22 +30,22 @@ 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_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 //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_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 //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 +#define PKG_SIZE_ENCR_MNFST 12 // the properties related constants #define ENCRYPTION_KEY_PROPERTY "EncryptionKey" diff --git a/package/inc/ZipEnumeration.hxx b/package/inc/ZipEnumeration.hxx index cc4156a0ee52..f0a810ea29cd 100644 --- a/package/inc/ZipEnumeration.hxx +++ b/package/inc/ZipEnumeration.hxx @@ -23,12 +23,13 @@ class ZipEnumeration final { - EntryHash &rEntryHash; + EntryHash& rEntryHash; EntryHash::const_iterator aIterator; + public: bool hasMoreElements(); - const ZipEntry * nextElement(); - ZipEnumeration( EntryHash &rNewEntryHash ); + const ZipEntry* nextElement(); + ZipEnumeration(EntryHash& rNewEntryHash); ~ZipEnumeration(); }; |