Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/kornelski/7z.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to '7zip/Archive/Zip/ZipAddCommon.h')
-rwxr-xr-x7zip/Archive/Zip/ZipAddCommon.h12
1 files changed, 10 insertions, 2 deletions
diff --git a/7zip/Archive/Zip/ZipAddCommon.h b/7zip/Archive/Zip/ZipAddCommon.h
index e116ea9c..26cec643 100755
--- a/7zip/Archive/Zip/ZipAddCommon.h
+++ b/7zip/Archive/Zip/ZipAddCommon.h
@@ -12,14 +12,17 @@
#include "../Common/FilterCoder.h"
#include "ZipCompressionMode.h"
#include "../../Crypto/Zip/ZipCipher.h"
+#include "../../Crypto/WzAES/WzAES.h"
namespace NArchive {
namespace NZip {
struct CCompressingResult
{
- Byte Method;
+ UInt64 UnpackSize;
UInt64 PackSize;
+ UInt32 CRC;
+ UInt16 Method;
Byte ExtractVersion;
};
@@ -38,11 +41,16 @@ class CAddCommon
CMyComPtr<ISequentialOutStream> _cryptoStream;
NCrypto::NZip::CEncoder *_filterSpec;
+ NCrypto::NWzAES::CEncoder *_filterAesSpec;
+
+ CMyComPtr<ICompressFilter> _zipCryptoFilter;
+ CMyComPtr<ICompressFilter> _aesFilter;
+
public:
CAddCommon(const CCompressionMethodMode &options);
HRESULT Compress(ISequentialInStream *inStream, IOutStream *outStream,
- UInt64 inSize, ICompressProgressInfo *progress, CCompressingResult &operationResult);
+ ICompressProgressInfo *progress, CCompressingResult &operationResult);
};
}}