crypto/ofb128.c: make it indent-friendly.

[openssl.git] / crypto / modes / ofb128.c

diff --git a/crypto/modes/ofb128.c b/crypto/modes/ofb128.c
index ae264c832c5fefba52f611d2fe265917a383dc24..2b061176494005b250d82d7eaff01ab68c6877a7 100644 (file)
--- a/crypto/modes/ofb128.c
+++ b/crypto/modes/ofb128.c
@@ -48,7 +48,8 @@
  *
  */
 
-#include <stddef.h>
+#include <openssl/crypto.h>
+#include "modes_lcl.h"
 #include <string.h>
 
 #ifndef MODES_DEBUG
@@ -58,16 +59,6 @@
 #endif
 #include <assert.h>
 
-#include "modes.h"
-
-#define STRICT_ALIGNMENT
-#if defined(__i386) || defined(__i386__) || \
-    defined(__x86_64) || defined(__x86_64__) || \
-    defined(_M_IX86) || defined(_M_AMD64) || defined(_M_X64) || \
-    defined(__s390__) || defined(__s390x__)
-#  undef STRICT_ALIGNMENT
-#endif
-
 /* The input and output encrypted as though 128bit ofb mode is being
  * used.  The extra state information to record how much of the
  * 128bit block we have used is contained in *num;
@@ -75,7 +66,7 @@
 void CRYPTO_ofb128_encrypt(const unsigned char *in, unsigned char *out,
                        size_t len, const void *key,
                        unsigned char ivec[16], int *num,
-                       block_f block)
+                       block128_f block)
 {
        unsigned int n;
        size_t l=0;
@@ -85,7 +76,8 @@ void CRYPTO_ofb128_encrypt(const unsigned char *in, unsigned char *out,
        n = *num;
 
 #if !defined(OPENSSL_SMALL_FOOTPRINT)
-       if (16%sizeof(size_t) == 0) do { /* always true actually */
+       if (16%sizeof(size_t) == 0) { /* always true actually */
+           do {
                while (n && len) {
                        *(out++) = *(in++) ^ ivec[n];
                        --len;
@@ -97,14 +89,14 @@ void CRYPTO_ofb128_encrypt(const unsigned char *in, unsigned char *out,
 #endif
                while (len>=16) {
                        (*block)(ivec, ivec, key);
-                       for (n=0; n<16; n+=sizeof(size_t))
+                       for (; n<16; n+=sizeof(size_t))
                                *(size_t*)(out+n) =
                                *(size_t*)(in+n) ^ *(size_t*)(ivec+n);
                        len -= 16;
                        out += 16;
                        in  += 16;
+                       n = 0;
                }
-               n = 0;
                if (len) {
                        (*block)(ivec, ivec, key);
                        while (len--) {
@@ -114,7 +106,8 @@ void CRYPTO_ofb128_encrypt(const unsigned char *in, unsigned char *out,
                }
                *num = n;
                return;
-       } while(0);
+           } while(0);
+       }
        /* the rest would be commonly eliminated by x86* compiler */
 #endif
        while (l<len) {