1 files changed, 46 insertions, 50 deletions

diff --git a/src/lib/libcrypto/evp/e_xcbc_d.c b/src/lib/libcrypto/evp/e_xcbc_d.c
index 250e88c8c5..7313e4d225 100644
--- a/src/lib/libcrypto/evp/e_xcbc_d.c
+++ b/src/lib/libcrypto/evp/e_xcbc_d.c
@@ -5,21 +5,21 @@
  * This package is an SSL implementation written
  * by Eric Young (eay@cryptsoft.com).
  * The implementation was written so as to conform with Netscapes SSL.
- * 
+ *
  * This library is free for commercial and non-commercial use as long as
  * the following conditions are aheared to.  The following conditions
  * apply to all code found in this distribution, be it the RC4, RSA,
  * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
  * included with this distribution is covered by the same copyright terms
  * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- * 
+ *
  * Copyright remains Eric Young's, and as such any Copyright notices in
  * the code are not to be removed.
  * If this package is used in a product, Eric Young should be given attribution
  * as the author of the parts of the library used.
  * This can be in the form of a textual message at program startup or
  * in documentation (online or textual) provided with the package.
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ -34,10 +34,10 @@
  *     Eric Young (eay@cryptsoft.com)"
  *    The word 'cryptographic' can be left out if the rouines from the library
  *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from 
+ * 4. If you include any Windows specific code (or a derivative thereof) from
  *    the apps directory (application code) you must include an acknowledgement:
  *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -49,7 +49,7 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- * 
+ *
  * The licence and distribution terms for any publically available version or
  * derivative of this code cannot be changed.  i.e. this code cannot simply be
  * copied and put under another distribution licence
@@ -67,24 +67,22 @@
 #include <openssl/des.h>
 
 static int desx_cbc_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
-                             const unsigned char *iv,int enc);
+    const unsigned char *iv, int enc);
 static int desx_cbc_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
-                           const unsigned char *in, size_t inl);
+    const unsigned char *in, size_t inl);
 
 
-typedef struct
-    {
-    DES_key_schedule ks;/* key schedule */
-    DES_cblock inw;
-    DES_cblock outw;
-    } DESX_CBC_KEY;
+typedef struct {
+        DES_key_schedule ks;/* key schedule */
+        DES_cblock inw;
+        DES_cblock outw;
+} DESX_CBC_KEY;
 
 #define data(ctx) ((DESX_CBC_KEY *)(ctx)->cipher_data)
 
-static const EVP_CIPHER d_xcbc_cipher=
-        {
+static const EVP_CIPHER d_xcbc_cipher = {
         NID_desx_cbc,
-        8,24,8,
+        8, 24, 8,
         EVP_CIPH_CBC_MODE,
         desx_cbc_init_key,
         desx_cbc_cipher,
@@ -94,45 +92,43 @@ static const EVP_CIPHER d_xcbc_cipher=
         EVP_CIPHER_get_asn1_iv,
         NULL,
         NULL
-        };
+};
 
-const EVP_CIPHER *EVP_desx_cbc(void)
-        {
-        return(&d_xcbc_cipher);
-        }
-        
-static int desx_cbc_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
-                             const unsigned char *iv, int enc)
-        {
+const EVP_CIPHER *
+EVP_desx_cbc(void)
+{
+        return (&d_xcbc_cipher);
+}
+
+static int
+desx_cbc_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
+    const unsigned char *iv, int enc)
+{
         DES_cblock *deskey = (DES_cblock *)key;
 
-        DES_set_key_unchecked(deskey,&data(ctx)->ks);
-        memcpy(&data(ctx)->inw[0],&key[8],8);
-        memcpy(&data(ctx)->outw[0],&key[16],8);
+        DES_set_key_unchecked(deskey, &data(ctx)->ks);
+        memcpy(&data(ctx)->inw[0], &key[8], 8);
+        memcpy(&data(ctx)->outw[0], &key[16], 8);
 
         return 1;
-        }
+}
 
-static int desx_cbc_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
-                           const unsigned char *in, size_t inl)
-        {
-        while (inl>=EVP_MAXCHUNK)
-                {
-                DES_xcbc_encrypt(in,out,(long)EVP_MAXCHUNK,&data(ctx)->ks,
-                         (DES_cblock *)&(ctx->iv[0]),
-                         &data(ctx)->inw,
-                         &data(ctx)->outw,
-                         ctx->encrypt);
-                inl-=EVP_MAXCHUNK;
-                in +=EVP_MAXCHUNK;
-                out+=EVP_MAXCHUNK;
-                }
+static int
+desx_cbc_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
+    const unsigned char *in, size_t inl)
+{
+        while (inl >= EVP_MAXCHUNK) {
+                DES_xcbc_encrypt(in, out, (long)EVP_MAXCHUNK, &data(ctx)->ks,
+                    (DES_cblock *)&(ctx->iv[0]), &data(ctx)->inw,
+                    &data(ctx)->outw, ctx->encrypt);
+                inl -= EVP_MAXCHUNK;
+                in += EVP_MAXCHUNK;
+                out += EVP_MAXCHUNK;
+        }
         if (inl)
-                DES_xcbc_encrypt(in,out,(long)inl,&data(ctx)->ks,
-                        (DES_cblock *)&(ctx->iv[0]),
-                        &data(ctx)->inw,
-                        &data(ctx)->outw,
-                        ctx->encrypt);
+                DES_xcbc_encrypt(in, out, (long)inl, &data(ctx)->ks,
+                    (DES_cblock *)&(ctx->iv[0]), &data(ctx)->inw,
+                    &data(ctx)->outw, ctx->encrypt);
         return 1;
-        }
+}
 #endif