This commit is contained in:
Igor Pavlov
2009-01-02 00:00:00 +00:00
committed by Kornel Lesiński
parent 3a524e5ba2
commit 1dc92281fa
7 changed files with 19 additions and 19 deletions

View File

@@ -425,7 +425,7 @@ class CZipDecoder
CObjectVector<CMethodItem> methodItems;
public:
CZipDecoder():
CZipDecoder():
_zipCryptoDecoderSpec(0),
_pkAesDecoderSpec(0),
_wzAesDecoderSpec(0),
@@ -662,11 +662,6 @@ HRESULT CZipDecoder::Decode(
if (wzAesMode)
{
result = _wzAesDecoderSpec->ReadHeader(inStream);
if (result == S_OK)
{
if (!_wzAesDecoderSpec->CheckPasswordVerifyCode())
result = S_FALSE;
}
}
else if (pkAesMode)
{
@@ -689,6 +684,11 @@ HRESULT CZipDecoder::Decode(
RINOK(filterStreamSpec->SetInStream(inStream));
inStreamReleaser.FilterCoder = filterStreamSpec;
inStreamNew = filterStream;
if (wzAesMode)
{
if (!_wzAesDecoderSpec->CheckPasswordVerifyCode())
result = S_FALSE;
}
}
}
else

View File

@@ -1,8 +1,8 @@
#define MY_VER_MAJOR 4
#define MY_VER_MINOR 63
#define MY_VER_MINOR 64
#define MY_VER_BUILD 0
#define MY_VERSION "4.63"
#define MY_7ZIP_VERSION "7-Zip 4.63"
#define MY_DATE "2008-12-31"
#define MY_COPYRIGHT "Copyright (c) 1999-2008 Igor Pavlov"
#define MY_VERSION "4.64"
#define MY_7ZIP_VERSION "7-Zip 4.64"
#define MY_DATE "2009-01-03"
#define MY_COPYRIGHT "Copyright (c) 1999-2009 Igor Pavlov"
#define MY_VERSION_COPYRIGHT_DATE MY_VERSION " " MY_COPYRIGHT " " MY_DATE