Allow 32-bit perl to generate x86_64 assembler.

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

diff --git a/crypto/camellia/cmll_misc.c b/crypto/camellia/cmll_misc.c
index 3c4ec36662e0e345731fe8e4c61154ffdaf06860..f1047b54e03b427981156f338eb40700c48bd9c4 100644 (file)
--- a/crypto/camellia/cmll_misc.c
+++ b/crypto/camellia/cmll_misc.c
@@ -53,7 +53,7 @@
 #include <openssl/camellia.h>
 #include "cmll_locl.h"
 
-const char *CAMELLIA_version="CAMELLIA" OPENSSL_VERSION_PTEXT;
+const char CAMELLIA_version[]="CAMELLIA" OPENSSL_VERSION_PTEXT;
 
 int Camellia_set_key(const unsigned char *userKey, const int bits,
        CAMELLIA_KEY *key)
@@ -91,20 +91,26 @@ int Camellia_set_key(const unsigned char *userKey, const int bits,
 void Camellia_encrypt(const unsigned char *in, unsigned char *out,
        const CAMELLIA_KEY *key)
        {
-       uint32_t tmp[UNITSIZE];
+       u32 tmp[CAMELLIA_BLOCK_SIZE/sizeof(u32)];
+       const union { long one; char little; } camellia_endian = {1};
 
        memcpy(tmp, in, CAMELLIA_BLOCK_SIZE);
+       if (camellia_endian.little) SWAP4WORD(tmp);
        key->enc(key->rd_key, tmp);
+       if (camellia_endian.little) SWAP4WORD(tmp);
        memcpy(out, tmp, CAMELLIA_BLOCK_SIZE);
        }
 
 void Camellia_decrypt(const unsigned char *in, unsigned char *out,
        const CAMELLIA_KEY *key)
        {
-       uint32_t tmp[UNITSIZE];
+       u32 tmp[CAMELLIA_BLOCK_SIZE/sizeof(u32)];
+       const union { long one; char little; } camellia_endian = {1};
 
        memcpy(tmp, in, CAMELLIA_BLOCK_SIZE);
+       if (camellia_endian.little) SWAP4WORD(tmp);
        key->dec(key->rd_key, tmp);
+       if (camellia_endian.little) SWAP4WORD(tmp);
        memcpy(out, tmp, CAMELLIA_BLOCK_SIZE);
        }