bn_nist.c: harmonize buf in BN_nist_mod_256 with other mod functions and

[oweals/openssl.git] / crypto / camellia / camellia.c

diff --git a/crypto/camellia/camellia.c b/crypto/camellia/camellia.c
index 4d9346ae28abe7ca4c1cfc4eacf99fbe818b7709..75fc8991c087e3b436fb109098a8fb51700ec6cb 100644 (file)
--- a/crypto/camellia/camellia.c
+++ b/crypto/camellia/camellia.c
@@ -91,10 +91,24 @@
 # if defined(_MSC_VER) && (defined(_M_IX86) || defined(_M_AMD64) || defined(_M_X64))
 #  define RightRotate(x, s) _lrotr(x, s)
 #  define LeftRotate(x, s)  _lrotl(x, s)
+#  if _MSC_VER >= 1400
+#   define SWAP(x) _byteswap_ulong(x)
+#  else
+#   define SWAP(x) (_lrotl(x, 8) & 0x00ff00ff | _lrotr(x, 8) & 0xff00ff00)
+#  endif
+#  define GETU32(p)   SWAP(*((u32 *)(p)))
+#  define PUTU32(p,v) (*((u32 *)(p)) = SWAP((v)))
 # elif defined(__GNUC__) && __GNUC__>=2
 #  if defined(__i386) || defined(__x86_64)
 #   define RightRotate(x,s) ({u32 ret; asm ("rorl %1,%0":"=r"(ret):"I"(s),"0"(x):"cc"); ret; })
 #   define LeftRotate(x,s)  ({u32 ret; asm ("roll %1,%0":"=r"(ret):"I"(s),"0"(x):"cc"); ret; })
+#   if defined(B_ENDIAN) /* stratus.com does it */
+#    define GETU32(p)   (*(u32 *)(p))
+#    define PUTU32(p,v) (*(u32 *)(p)=(v))
+#   else
+#    define GETU32(p)   ({u32 r=*(const u32 *)(p); asm("bswapl %0":"=r"(r):"0"(r)); r; })
+#    define PUTU32(p,v) ({u32 r=(v); asm("bswapl %0":"=r"(r):"0"(r)); *(u32 *)(p)=r; })
+#   endif
 #  elif defined(_ARCH_PPC) || defined(_ARCH_PPC64) || \
         defined(__powerpc) || defined(__ppc__) || defined(__powerpc64__)
 #   define LeftRotate(x,s)  ({u32 ret; asm ("rlwinm %0,%1,%2,0,31":"=r"(ret):"r"(x),"I"(s)); ret; })
@@ -102,13 +116,20 @@
 #  elif defined(__s390x__)
 #   define LeftRotate(x,s)  ({u32 ret; asm ("rll %0,%1,%2":"=r"(ret):"r"(x),"I"(s)); ret; })
 #   define RightRotate(x,s) LeftRotate(x,(32-s))
+#   define GETU32(p)   (*(u32 *)(p))
+#   define PUTU32(p,v) (*(u32 *)(p)=(v))
 #  endif
 # endif
 #endif
 
 #if !defined(RightRotate) && !defined(LeftRotate)
-#define RightRotate(x, s) ( ((x) >> (s)) + ((x) << (32 - s)) )
-#define LeftRotate(x, s)  ( ((x) << (s)) + ((x) >> (32 - s)) )
+# define RightRotate(x, s) ( ((x) >> (s)) + ((x) << (32 - s)) )
+# define LeftRotate(x, s)  ( ((x) << (s)) + ((x) >> (32 - s)) )
+#endif
+
+#if !defined(GETU32) && !defined(PUTU32)
+# define GETU32(p)   (((u32)(p)[0] << 24) ^ ((u32)(p)[1] << 16) ^ ((u32)(p)[2] <<  8) ^ ((u32)(p)[3]))
+# define PUTU32(p,v) ((p)[0] = (u8)((v) >> 24), (p)[1] = (u8)((v) >> 16), (p)[2] = (u8)((v) >>  8), (p)[3] = (u8)(v))
 #endif
 
 /* S-box data */
@@ -292,7 +313,7 @@ static const u32 Camellia_SBOX[][256] = {
 };
 
 /* Key generation constants */
-const u32 SIGMA[] = {
+static const u32 SIGMA[] = {
     0xa09e667f, 0x3bcc908b, 0xb67ae858, 0x4caa73b2, 0xc6ef372f, 0xe94f82be,
     0x54ff53a5, 0xf1d36f1c, 0x10e527fa, 0xde682d1d, 0xb05688c2, 0xb3e6c1fd
 };
@@ -462,7 +483,7 @@ int Camellia_Ekeygen(int keyBitLength, const u8 *rawKey, KEY_TABLE_TYPE k)
         */ 
        }
 
-void Camellia_EncryptBlock(int grandRounds, const u8 plaintext[], 
+void Camellia_EncryptBlock_Rounds(int grandRounds, const u8 plaintext[], 
                const KEY_TABLE_TYPE keyTable, u8 ciphertext[])
        {
        register u32 s0,s1,s2,s3; 
@@ -504,8 +525,14 @@ void Camellia_EncryptBlock(int grandRounds, const u8 plaintext[],
        PUTU32(ciphertext+8, s0);
        PUTU32(ciphertext+12,s1);
        }
+void Camellia_EncryptBlock(int keyBitLength, const u8 plaintext[], 
+               const KEY_TABLE_TYPE keyTable, u8 ciphertext[])
+       {
+       Camellia_EncryptBlock_Rounds(keyBitLength==128?3:4,
+                       plaintext,keyTable,ciphertext);
+       }
 
-void Camellia_DecryptBlock(int grandRounds, const u8 ciphertext[], 
+void Camellia_DecryptBlock_Rounds(int grandRounds, const u8 ciphertext[], 
                const KEY_TABLE_TYPE keyTable, u8 plaintext[])
        {
        u32 s0,s1,s2,s3; 
@@ -547,3 +574,9 @@ void Camellia_DecryptBlock(int grandRounds, const u8 ciphertext[],
        PUTU32(plaintext+8, s0);
        PUTU32(plaintext+12,s1);
        }
+void Camellia_DecryptBlock(int keyBitLength, const u8 plaintext[], 
+               const KEY_TABLE_TYPE keyTable, u8 ciphertext[])
+       {
+       Camellia_DecryptBlock_Rounds(keyBitLength==128?3:4,
+                       plaintext,keyTable,ciphertext);
+       }