mirror of
https://github.com/Xevion/easy7zip.git
synced 2025-12-10 20:07:05 -06:00
Normalize all the line endings
This commit is contained in:
@@ -1,65 +1,65 @@
|
||||
// Crypto/ZipStrong.h
|
||||
|
||||
#ifndef __CRYPTO_ZIP_STRONG_H
|
||||
#define __CRYPTO_ZIP_STRONG_H
|
||||
|
||||
#include "../../Common/MyBuffer2.h"
|
||||
|
||||
#include "../IPassword.h"
|
||||
|
||||
#include "MyAes.h"
|
||||
|
||||
namespace NCrypto {
|
||||
namespace NZipStrong {
|
||||
|
||||
/* ICompressFilter::Init() does nothing for this filter.
|
||||
Call to init:
|
||||
Decoder:
|
||||
[CryptoSetPassword();]
|
||||
ReadHeader();
|
||||
[CryptoSetPassword();] Init_and_CheckPassword();
|
||||
[CryptoSetPassword();] Init_and_CheckPassword();
|
||||
*/
|
||||
|
||||
struct CKeyInfo
|
||||
{
|
||||
Byte MasterKey[32];
|
||||
UInt32 KeySize;
|
||||
|
||||
void SetPassword(const Byte *data, UInt32 size);
|
||||
};
|
||||
|
||||
class CBaseCoder:
|
||||
public CAesCbcDecoder,
|
||||
public ICryptoSetPassword
|
||||
{
|
||||
protected:
|
||||
CKeyInfo _key;
|
||||
CAlignedBuffer _bufAligned;
|
||||
public:
|
||||
STDMETHOD(Init)();
|
||||
STDMETHOD(CryptoSetPassword)(const Byte *data, UInt32 size);
|
||||
};
|
||||
|
||||
const unsigned kAesPadAllign = AES_BLOCK_SIZE;
|
||||
|
||||
class CDecoder: public CBaseCoder
|
||||
{
|
||||
UInt32 _ivSize;
|
||||
Byte _iv[16];
|
||||
UInt32 _remSize;
|
||||
public:
|
||||
MY_UNKNOWN_IMP1(ICryptoSetPassword)
|
||||
HRESULT ReadHeader(ISequentialInStream *inStream, UInt32 crc, UInt64 unpackSize);
|
||||
HRESULT Init_and_CheckPassword(bool &passwOK);
|
||||
UInt32 GetPadSize(UInt32 packSize32) const
|
||||
{
|
||||
// Padding is to align to blockSize of cipher.
|
||||
// Change it, if is not AES
|
||||
return kAesPadAllign - (packSize32 & (kAesPadAllign - 1));
|
||||
}
|
||||
};
|
||||
|
||||
}}
|
||||
|
||||
#endif
|
||||
// Crypto/ZipStrong.h
|
||||
|
||||
#ifndef __CRYPTO_ZIP_STRONG_H
|
||||
#define __CRYPTO_ZIP_STRONG_H
|
||||
|
||||
#include "../../Common/MyBuffer2.h"
|
||||
|
||||
#include "../IPassword.h"
|
||||
|
||||
#include "MyAes.h"
|
||||
|
||||
namespace NCrypto {
|
||||
namespace NZipStrong {
|
||||
|
||||
/* ICompressFilter::Init() does nothing for this filter.
|
||||
Call to init:
|
||||
Decoder:
|
||||
[CryptoSetPassword();]
|
||||
ReadHeader();
|
||||
[CryptoSetPassword();] Init_and_CheckPassword();
|
||||
[CryptoSetPassword();] Init_and_CheckPassword();
|
||||
*/
|
||||
|
||||
struct CKeyInfo
|
||||
{
|
||||
Byte MasterKey[32];
|
||||
UInt32 KeySize;
|
||||
|
||||
void SetPassword(const Byte *data, UInt32 size);
|
||||
};
|
||||
|
||||
class CBaseCoder:
|
||||
public CAesCbcDecoder,
|
||||
public ICryptoSetPassword
|
||||
{
|
||||
protected:
|
||||
CKeyInfo _key;
|
||||
CAlignedBuffer _bufAligned;
|
||||
public:
|
||||
STDMETHOD(Init)();
|
||||
STDMETHOD(CryptoSetPassword)(const Byte *data, UInt32 size);
|
||||
};
|
||||
|
||||
const unsigned kAesPadAllign = AES_BLOCK_SIZE;
|
||||
|
||||
class CDecoder: public CBaseCoder
|
||||
{
|
||||
UInt32 _ivSize;
|
||||
Byte _iv[16];
|
||||
UInt32 _remSize;
|
||||
public:
|
||||
MY_UNKNOWN_IMP1(ICryptoSetPassword)
|
||||
HRESULT ReadHeader(ISequentialInStream *inStream, UInt32 crc, UInt64 unpackSize);
|
||||
HRESULT Init_and_CheckPassword(bool &passwOK);
|
||||
UInt32 GetPadSize(UInt32 packSize32) const
|
||||
{
|
||||
// Padding is to align to blockSize of cipher.
|
||||
// Change it, if is not AES
|
||||
return kAesPadAllign - (packSize32 & (kAesPadAllign - 1));
|
||||
}
|
||||
};
|
||||
|
||||
}}
|
||||
|
||||
#endif
|
||||
|
||||
Reference in New Issue
Block a user