~zooko/cryptopp/trunk

« back to all changes in this revision

Viewing changes to mars.h

  • Committer: weidai
  • Date: 2011-01-07 01:30:24 UTC
  • Revision ID: svn-v4:57ff6487-cd31-0410-9ec3-f628ee90f5f0:trunk/c5:522
fix for compiling with Clang from Marshall Clow

Show diffs side-by-side

added added

removed removed

Lines of Context:
21
21
        class CRYPTOPP_NO_VTABLE Base : public BlockCipherImpl<MARS_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
                static const word32 Sbox[512];
28
28
 
29
 
                FixedSizeSecBlock<word32, 40> EK;
 
29
                FixedSizeSecBlock<word32, 40> m_k;
30
30
        };
31
31
 
32
32
        class CRYPTOPP_NO_VTABLE Enc : public Base