First pass at applying KNF to the OpenSSL code, which almost makes it

readable. This pass is whitespace only and can readily be verified using
tr and md5.

1 files changed, 50 insertions, 55 deletions

diff --git a/src/lib/libcrypto/md32_common.h b/src/lib/libcrypto/md32_common.h
index bb7381952a..bfb610e802 100644
--- a/src/lib/libcrypto/md32_common.h
+++ b/src/lib/libcrypto/md32_common.h
@@ -148,7 +148,7 @@
 #  if defined(__POWERPC__)
 #   define ROTATE(a,n)  __rlwinm(a,n,0,31)
 #  elif defined(__MC68K__)
-    /* Motorola specific tweak. <appro@fy.chalmers.se> */
+/* Motorola specific tweak. <appro@fy.chalmers.se> */
 #   define ROTATE(a,n)  ( n<24 ? __rol(a,n) : __ror(a,32-n) )
 #  else
 #   define ROTATE(a,n)  __rol(a,n)
@@ -252,7 +252,7 @@
 #endif
 #if defined(__i386) || defined(__i386__) || defined(__x86_64) || defined(__x86_64__)
 # ifndef B_ENDIAN
-   /* See comment in DATA_ORDER_IS_BIG_ENDIAN section. */
+/* See comment in DATA_ORDER_IS_BIG_ENDIAN section. */
 #  define HOST_c2l(c,l) ((l)=*((const unsigned int *)(c)), (c)+=4, l)
 #  define HOST_l2c(l,c) (*((unsigned int *)(c))=(l), (c)+=4, l)
 # endif
@@ -279,108 +279,103 @@
  * Time for some action:-)
  */
 
-int HASH_UPDATE (HASH_CTX *c, const void *data_, size_t len)
-        {
-        const unsigned char *data=data_;
+int
+HASH_UPDATE(HASH_CTX *c, const void *data_, size_t len)
+{
+        const unsigned char *data = data_;
         unsigned char *p;
         HASH_LONG l;
         size_t n;
 
-        if (len==0) return 1;
+        if (len == 0)
+                return 1;
 
-        l=(c->Nl+(((HASH_LONG)len)<<3))&0xffffffffUL;
+        l = (c->Nl + (((HASH_LONG)len) << 3))&0xffffffffUL;
         /* 95-05-24 eay Fixed a bug with the overflow handling, thanks to
          * Wei Dai <weidai@eskimo.com> for pointing it out. */
         if (l < c->Nl) /* overflow */
                 c->Nh++;
         c->Nh+=(HASH_LONG)(len>>29);    /* might cause compiler warning on 16-bit */
-        c->Nl=l;
+        c->Nl = l;
 
         n = c->num;
-        if (n != 0)
-                {
-                p=(unsigned char *)c->data;
-
-                if (len >= HASH_CBLOCK || len+n >= HASH_CBLOCK)
-                        {
-                        memcpy (p+n,data,HASH_CBLOCK-n);
-                        HASH_BLOCK_DATA_ORDER (c,p,1);
-                        n      = HASH_CBLOCK-n;
-                        data  += n;
-                        len   -= n;
+        if (n != 0) {
+                p = (unsigned char *)c->data;
+
+                if (len >= HASH_CBLOCK || len + n >= HASH_CBLOCK) {
+                        memcpy (p + n, data, HASH_CBLOCK - n);
+                        HASH_BLOCK_DATA_ORDER (c, p, 1);
+                        n = HASH_CBLOCK - n;
+                        data += n;
+                        len -= n;
                         c->num = 0;
                         memset (p,0,HASH_CBLOCK);       /* keep it zeroed */
-                        }
-                else
-                        {
-                        memcpy (p+n,data,len);
+                } else {
+                        memcpy (p + n, data, len);
                         c->num += (unsigned int)len;
                         return 1;
-                        }
                 }
+        }
 
         n = len/HASH_CBLOCK;
-        if (n > 0)
-                {
-                HASH_BLOCK_DATA_ORDER (c,data,n);
+        if (n > 0) {
+                HASH_BLOCK_DATA_ORDER (c, data, n);
                 n    *= HASH_CBLOCK;
                 data += n;
-                len  -= n;
-                }
+                len -= n;
+        }
 
-        if (len != 0)
-                {
+        if (len != 0) {
                 p = (unsigned char *)c->data;
                 c->num = (unsigned int)len;
-                memcpy (p,data,len);
-                }
-        return 1;
+                memcpy (p, data, len);
         }
+        return 1;
+}
 
 
 void HASH_TRANSFORM (HASH_CTX *c, const unsigned char *data)
-        {
-        HASH_BLOCK_DATA_ORDER (c,data,1);
-        }
+{
+        HASH_BLOCK_DATA_ORDER (c, data, 1);
+}
 
 
 int HASH_FINAL (unsigned char *md, HASH_CTX *c)
-        {
+{
         unsigned char *p = (unsigned char *)c->data;
         size_t n = c->num;
 
         p[n] = 0x80; /* there is always room for one */
         n++;
 
-        if (n > (HASH_CBLOCK-8))
-                {
-                memset (p+n,0,HASH_CBLOCK-n);
-                n=0;
-                HASH_BLOCK_DATA_ORDER (c,p,1);
-                }
-        memset (p+n,0,HASH_CBLOCK-8-n);
+        if (n > (HASH_CBLOCK - 8)) {
+                memset (p + n, 0, HASH_CBLOCK - n);
+                n = 0;
+                HASH_BLOCK_DATA_ORDER (c, p, 1);
+        }
+        memset (p + n, 0, HASH_CBLOCK - 8 - n);
 
-        p += HASH_CBLOCK-8;
+        p += HASH_CBLOCK - 8;
 #if   defined(DATA_ORDER_IS_BIG_ENDIAN)
-        (void)HOST_l2c(c->Nh,p);
-        (void)HOST_l2c(c->Nl,p);
+        (void)HOST_l2c(c->Nh, p);
+        (void)HOST_l2c(c->Nl, p);
 #elif defined(DATA_ORDER_IS_LITTLE_ENDIAN)
-        (void)HOST_l2c(c->Nl,p);
-        (void)HOST_l2c(c->Nh,p);
+        (void)HOST_l2c(c->Nl, p);
+        (void)HOST_l2c(c->Nh, p);
 #endif
         p -= HASH_CBLOCK;
-        HASH_BLOCK_DATA_ORDER (c,p,1);
-        c->num=0;
-        memset (p,0,HASH_CBLOCK);
+        HASH_BLOCK_DATA_ORDER (c, p, 1);
+        c->num = 0;
+        memset (p, 0, HASH_CBLOCK);
 
 #ifndef HASH_MAKE_STRING
 #error "HASH_MAKE_STRING must be defined!"
 #else
-        HASH_MAKE_STRING(c,md);
+        HASH_MAKE_STRING(c, md);
 #endif
 
         return 1;
-        }
+}
 
 #ifndef MD32_REG_T
 #if defined(__alpha) || defined(__sparcv9) || defined(__mips)