From f05ea58bb369988a61438411539ea955e0adf8c2 Mon Sep 17 00:00:00 2001 From: weidai Date: Sun, 10 Dec 2006 02:12:23 +0000 Subject: port to GCC 4, reorganize implementations of SetKey --- des.h | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'des.h') diff --git a/des.h b/des.h index 8400fa1b..62f62882 100644 --- a/des.h +++ b/des.h @@ -12,7 +12,7 @@ NAMESPACE_BEGIN(CryptoPP) class CRYPTOPP_DLL RawDES { public: - void UncheckedSetKey(CipherDir direction, const byte *userKey, unsigned int length = 8); + void RawSetKey(CipherDir direction, const byte *userKey); void RawProcessBlock(word32 &l, word32 &r) const; protected: @@ -38,6 +38,7 @@ class DES : public DES_Info, public BlockCipherDocumentation class CRYPTOPP_NO_VTABLE Base : public BlockCipherImpl, public RawDES { public: + void UncheckedSetKey(const byte *userKey, unsigned int length, const NameValuePairs ¶ms); void ProcessAndXorBlock(const byte *inBlock, const byte *xorBlock, byte *outBlock) const; }; @@ -63,7 +64,7 @@ class DES_EDE2 : public DES_EDE2_Info, public BlockCipherDocumentation class CRYPTOPP_DLL CRYPTOPP_NO_VTABLE Base : public BlockCipherImpl { public: - void UncheckedSetKey(CipherDir direction, const byte *userKey, unsigned int length); + void UncheckedSetKey(const byte *userKey, unsigned int length, const NameValuePairs ¶ms); void ProcessAndXorBlock(const byte *inBlock, const byte *xorBlock, byte *outBlock) const; protected: @@ -87,7 +88,7 @@ class DES_EDE3 : public DES_EDE3_Info, public BlockCipherDocumentation class CRYPTOPP_DLL CRYPTOPP_NO_VTABLE Base : public BlockCipherImpl { public: - void UncheckedSetKey(CipherDir dir, const byte *key, unsigned int length); + void UncheckedSetKey(const byte *userKey, unsigned int length, const NameValuePairs ¶ms); void ProcessAndXorBlock(const byte *inBlock, const byte *xorBlock, byte *outBlock) const; protected: @@ -111,7 +112,7 @@ class DES_XEX3 : public DES_XEX3_Info, public BlockCipherDocumentation class CRYPTOPP_NO_VTABLE Base : public BlockCipherImpl { public: - void UncheckedSetKey(CipherDir dir, const byte *key, unsigned int length); + void UncheckedSetKey(const byte *userKey, unsigned int length, const NameValuePairs ¶ms); void ProcessAndXorBlock(const byte *inBlock, const byte *xorBlock, byte *outBlock) const; protected: -- cgit v1.2.1