1 files changed, 24 insertions, 24 deletions

diff --git a/src/lib/libssl/src/crypto/evp/e_ecb_d.c b/src/lib/libssl/src/crypto/evp/e_ecb_d.c
index 7a409d6459..5fb4e64b1c 100644
--- a/src/lib/libssl/src/crypto/evp/e_ecb_d.c
+++ b/src/lib/libssl/src/crypto/evp/e_ecb_d.c
@@ -56,21 +56,16 @@
  * [including the GNU Public Licence.]
  */
 
+#ifndef NO_DES
 #include <stdio.h>
 #include "cryptlib.h"
-#include "evp.h"
-#include "objects.h"
+#include <openssl/evp.h>
+#include <openssl/objects.h>
 
-#ifndef NOPROTO
 static void des_ecb_init_key(EVP_CIPHER_CTX *ctx, unsigned char *key,
         unsigned char *iv,int enc);
 static void des_ecb_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
         unsigned char *in, unsigned int inl);
-#else
-static void des_ecb_init_key();
-static void des_ecb_cipher();
-#endif
-
 static EVP_CIPHER d_ecb_cipher=
         {
         NID_des_ecb,
@@ -84,35 +79,40 @@ static EVP_CIPHER d_ecb_cipher=
         NULL,
         };
 
-EVP_CIPHER *EVP_des_ecb()
+EVP_CIPHER *EVP_des_ecb(void)
         {
         return(&d_ecb_cipher);
         }
         
-static void des_ecb_init_key(ctx,key,iv,enc)
-EVP_CIPHER_CTX *ctx;
-unsigned char *key;
-unsigned char *iv;
-int enc;
+static void des_ecb_init_key(EVP_CIPHER_CTX *ctx, unsigned char *key,
+             unsigned char *iv, int enc)
         {
-        if (key != NULL)
-                des_set_key((des_cblock *)key,ctx->c.des_ks);
+        des_cblock *deskey = (des_cblock *)key;
+
+        if (deskey != NULL)
+                des_set_key(deskey,ctx->c.des_ks);
         }
 
-static void des_ecb_cipher(ctx,out,in,inl)
-EVP_CIPHER_CTX *ctx;
-unsigned char *out;
-unsigned char *in;
-unsigned int inl;
+static void des_ecb_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
+             unsigned char *in, unsigned int inl)
         {
         unsigned int i;
+        des_cblock *output  /* = (des_cblock *)out */;
+        des_cblock *input   /* = (des_cblock *)in */; 
 
         if (inl < 8) return;
         inl-=8;
         for (i=0; i<=inl; i+=8)
                 {
-                des_ecb_encrypt(
-                        (des_cblock *)&(in[i]),(des_cblock *)&(out[i]),
-                        ctx->c.des_ks,ctx->encrypt);
+                /* Either this ... */
+                output = (des_cblock *)(out + i);
+                input = (des_cblock *)(in + i);
+
+                des_ecb_encrypt(input,output,ctx->c.des_ks,ctx->encrypt);
+
+                /* ... or this. */
+                /* output++; */
+                /* input++; */
                 }
         }
+#endif