From 9c4e83bd0dc50000ab945875cf1c4b71c2d9c5ee Mon Sep 17 00:00:00 2001 From: weidai Date: Sun, 15 Apr 2007 22:59:58 +0000 Subject: optimized Camellia and added defense against timing attacks git-svn-id: svn://svn.code.sf.net/p/cryptopp/code/trunk/c5@286 57ff6487-cd31-0410-9ec3-f628ee90f5f0 --- camellia.h | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) (limited to 'camellia.h') diff --git a/camellia.h b/camellia.h index dd88720..599824d 100644 --- a/camellia.h +++ b/camellia.h @@ -3,8 +3,6 @@ #include "config.h" -#ifdef WORD64_AVAILABLE - /** \file */ @@ -30,16 +28,11 @@ class Camellia : public Camellia_Info, public BlockCipherDocumentation unsigned int BlockAlignment() const {return 8;} protected: - static word64 F(word64 X); - static void FLlayer(word64 *x, word64 K1, word64 K2); - static const byte s1[256]; - static const byte s2[256]; - static const byte s3[256]; - static const byte s4[256]; + static const word32 SP[4][256]; unsigned int m_rounds; - SecBlock m_key; + SecBlock m_key; }; public: @@ -53,5 +46,3 @@ typedef Camellia::Decryption CamelliaDecryption; NAMESPACE_END #endif - -#endif -- cgit v1.2.1