~zooko/cryptopp/trunk

« back to all changes in this revision

Viewing changes to rijndael.h

  • Committer: weidai
  • Date: 2007-05-04 15:36:15 UTC
  • Revision ID: svn-v4:57ff6487-cd31-0410-9ec3-f628ee90f5f0:trunk/c5:339
fix compile

Show diffs side-by-side

added added

removed removed

Lines of Context:
21
21
        class CRYPTOPP_DLL CRYPTOPP_NO_VTABLE Base : public BlockCipherImpl<Rijndael_Info>
22
22
        {
23
23
        public:
24
 
                void UncheckedSetKey(CipherDir direction, const byte *userKey, unsigned int length);
 
24
                void UncheckedSetKey(const byte *userKey, unsigned int length, const NameValuePairs &params);
25
25
 
26
26
        protected:
27
27
                // VS2005 workaround: have to put these on seperate lines, or error C2487 is triggered in DLL build
28
 
                CRYPTOPP_L1_CACHE_ALIGN(static const byte Se[256]);
29
 
                CRYPTOPP_L1_CACHE_ALIGN(static const byte Sd[256]);
30
 
                CRYPTOPP_L1_CACHE_ALIGN(static const word32 Te0[256]);
31
 
                static const word32 Te1[256];
32
 
                static const word32 Te2[256];
33
 
                static const word32 Te3[256];
34
 
                CRYPTOPP_L1_CACHE_ALIGN(static const word32 Td0[256]);
35
 
                static const word32 Td1[256];
36
 
                static const word32 Td2[256];
37
 
                static const word32 Td3[256];
 
28
                static const byte Se[256];
 
29
                static const byte Sd[256];
 
30
                static const word32 Te[4*256];
 
31
                static const word32 Td[4*256];
38
32
 
39
33
                static const word32 rcon[];
40
34