Changeset 1014 for trunk/library/xtea.c

Timestamp:

04/24/11 10:57:21 (13 months ago)

Author:

paul

Message:

• Major type rewrite of int to size_t for most variables and arguments used for buffer lengths and loops

File:

• trunk/library/xtea.c (modified) (5 diffs)

trunk/library/xtea.c

@@ -30 +30 @@
 #include "polarssl/xtea.h"
 
-#include <string.h>
-
 /*
  * 32-bit integer manipulation macros (big endian)
@@ -39 +37 @@
 {                                                       \
     (n) = ( (unsigned long) (b)[(i)    ] << 24 )        \
-            | ( (unsigned long) (b)[(i) + 1] << 16 )        \
-            | ( (unsigned long) (b)[(i) + 2] <<  8 )        \
-            | ( (unsigned long) (b)[(i) + 3]       );       \
+        | ( (unsigned long) (b)[(i) + 1] << 16 )        \
+        | ( (unsigned long) (b)[(i) + 2] <<  8 )        \
+        | ( (unsigned long) (b)[(i) + 3]       );       \
 }
 #endif
@@ -66 +64 @@
     for( i = 0; i < 4; i++ )
     {
-        GET_ULONG_BE( ctx->k[i], key, i << 2 );
+        GET_ULONG_BE( ctx->k[i], key, i << 2 );
     }
 }
@@ -85 +83 @@
     if( mode == XTEA_ENCRYPT )
     {
-            uint32_t sum = 0, delta = 0x9E3779B9;
-
-            for( i = 0; i < 32; i++ )
-            {
-                    v0 += (((v1 << 4) ^ (v1 >> 5)) + v1) ^ (sum + k[sum & 3]);
-                    sum += delta;
-                    v1 += (((v0 << 4) ^ (v0 >> 5)) + v0) ^ (sum + k[(sum>>11) & 3]);
-            }
+        uint32_t sum = 0, delta = 0x9E3779B9;
+
+        for( i = 0; i < 32; i++ )
+        {
+            v0 += (((v1 << 4) ^ (v1 >> 5)) + v1) ^ (sum + k[sum & 3]);
+            sum += delta;
+            v1 += (((v0 << 4) ^ (v0 >> 5)) + v0) ^ (sum + k[(sum>>11) & 3]);
+        }
     }
     else /* XTEA_DECRYPT */
     {
-            uint32_t delta = 0x9E3779B9, sum = delta * 32;
-
-            for( i = 0; i < 32; i++ )
-            {
-                    v1 -= (((v0 << 4) ^ (v0 >> 5)) + v0) ^ (sum + k[(sum>>11) & 3]);
-                    sum -= delta;
-                    v0 -= (((v1 << 4) ^ (v1 >> 5)) + v1) ^ (sum + k[sum & 3]);
-            }
+        uint32_t delta = 0x9E3779B9, sum = delta * 32;
+
+        for( i = 0; i < 32; i++ )
+        {
+            v1 -= (((v0 << 4) ^ (v0 >> 5)) + v0) ^ (sum + k[(sum>>11) & 3]);
+            sum -= delta;
+            v0 -= (((v1 << 4) ^ (v1 >> 5)) + v1) ^ (sum + k[sum & 3]);
+        }
     }
 
@@ -117 +115 @@
 int xtea_crypt_cbc( xtea_context *ctx,
                     int mode,
-                    int length,
+                    size_t length,
                     unsigned char iv[8],
                     unsigned char *input,