diff options
| author | Igor Pavlov <ipavlov@users.sourceforge.net> | 2009-12-22 03:00:00 +0300 |
|---|---|---|
| committer | Kornel Lesiński <kornel@geekhood.net> | 2016-05-28 02:16:02 +0300 |
| commit | db5eb6d638f5a5ec10517ed4a994b849a6cc7d29 (patch) | |
| tree | 91f966ba3bc92519bfe98056d503ed5371332bca /CPP | |
| parent | 1fbaf0aac5000ca563a1ee2bb15ba6821a08e468 (diff) | |
9.10 beta
Diffstat (limited to 'CPP')
| -rwxr-xr-x | CPP/7zip/Archive/Zip/ZipAddCommon.cpp | 8 | ||||
| -rwxr-xr-x | CPP/7zip/MyVersion.h | 8 |
2 files changed, 6 insertions, 10 deletions
diff --git a/CPP/7zip/Archive/Zip/ZipAddCommon.cpp b/CPP/7zip/Archive/Zip/ZipAddCommon.cpp index 8800270b..0a74a3d1 100755 --- a/CPP/7zip/Archive/Zip/ZipAddCommon.cpp +++ b/CPP/7zip/Archive/Zip/ZipAddCommon.cpp @@ -162,19 +162,15 @@ HRESULT CAddCommon::Compress( { _cryptoStreamSpec->Filter = _filterAesSpec = new NCrypto::NWzAes::CEncoder; _filterAesSpec->SetKeyMode(_options.AesKeyMode); - RINOK(_filterAesSpec->CryptoSetPassword( - (const Byte *)(const char *)_options.Password, _options.Password.Length())); + RINOK(_filterAesSpec->CryptoSetPassword((const Byte *)(const char *)_options.Password, _options.Password.Length())); } RINOK(_filterAesSpec->WriteHeader(outStream)); } else { if (!_cryptoStreamSpec->Filter) - { _cryptoStreamSpec->Filter = _filterSpec = new NCrypto::NZip::CEncoder; - RINOK(_filterSpec->CryptoSetPassword( - (const Byte *)(const char *)_options.Password, _options.Password.Length())); - } + RINOK(_filterSpec->CryptoSetPassword((const Byte *)(const char *)_options.Password, _options.Password.Length())); UInt32 crc = 0; RINOK(GetStreamCRC(inStream, crc)); RINOK(inCrcStreamSpec->Seek(0, STREAM_SEEK_SET, NULL)); diff --git a/CPP/7zip/MyVersion.h b/CPP/7zip/MyVersion.h index c9ebe92b..28fbfaaa 100755 --- a/CPP/7zip/MyVersion.h +++ b/CPP/7zip/MyVersion.h @@ -1,8 +1,8 @@ #define MY_VER_MAJOR 9 -#define MY_VER_MINOR 9 +#define MY_VER_MINOR 10 #define MY_VER_BUILD 0 -#define MY_VERSION "9.09 beta" -#define MY_7ZIP_VERSION "7-Zip 9.09 beta" -#define MY_DATE "2009-12-12" +#define MY_VERSION "9.10 beta" +#define MY_7ZIP_VERSION "7-Zip 9.10 beta" +#define MY_DATE "2009-12-22" #define MY_COPYRIGHT "Copyright (c) 1999-2009 Igor Pavlov" #define MY_VERSION_COPYRIGHT_DATE MY_VERSION " " MY_COPYRIGHT " " MY_DATE |