xevion/easy7zip
1
0
Fork 0
mirror of https://github.com/Xevion/easy7zip.git synced 2025-12-15 18:11:43 -06:00
Code Issues Packages Projects Releases Wiki Activity

4.27 beta

Browse Source
This commit is contained in:
Igor Pavlov
2005-09-21 00:00:00 +00:00
committed by Kornel Lesiński
parent 31e7b924e8
commit d66cf2fcf3
393 changed files with 17345 additions and 4743 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
7zip/Crypto/7zAES/7zAES.cpp
View File

@@ -5,6 +5,7 @@
#include "Windows/Defs.h"
#include "Windows/Synchronization.h"
#include "../../Common/StreamObjects.h"
#include "../../Common/StreamUtils.h"
#include "7zAES.h"
// #include "../../Hash/Common/CryptoHashInterface.h"
@@ -169,11 +170,11 @@ STDMETHODIMP CEncoder::WriteCoderProperties(ISequentialOutStream *outStream)
RINOK(outStream->Write(&secondByte, 1, NULL));
if (_key.SaltSize > 0)
{
RINOK(outStream->Write(_key.Salt, _key.SaltSize, NULL));
RINOK(WriteStream(outStream, _key.Salt, _key.SaltSize, NULL));
}
if (ivSize > 0)
{
RINOK(outStream->Write(_iv, ivSize, NULL));
RINOK(WriteStream(outStream, _iv, ivSize, NULL));
}
return S_OK;
}

8
7zip/Crypto/7zAES/7zAES.dsp
View File

@@ -154,6 +154,14 @@ SOURCE=..\..\Common\StreamObjects.h
# End Source File
# Begin Source File
SOURCE=..\..\Common\StreamUtils.cpp
# End Source File
# Begin Source File
SOURCE=..\..\Common\StreamUtils.h
# End Source File
# Begin Source File
SOURCE=..\..\..\Common\StringConvert.cpp
# End Source File
# Begin Source File

1
7zip/Crypto/7zAES/makefile
View File

@@ -22,6 +22,7 @@ WIN_OBJS = \
7ZIP_COMMON_OBJS = \
$O\StreamObjects.obj \
$O\StreamUtils.obj \
OBJS = \
$O\StdAfx.obj \