Change the command line options of mkerr.pl so -static is now default and

[oweals/openssl.git] / crypto / evp / e_ecb_d.c

diff --git a/crypto/evp/e_ecb_d.c b/crypto/evp/e_ecb_d.c
index de3aff5ce219ca43a2c7909a522fba2310a5f11a..a9edc530d0296e6fa24c65d687c8114f658ae4d3 100644 (file)
--- a/crypto/evp/e_ecb_d.c
+++ b/crypto/evp/e_ecb_d.c
@@ -58,8 +58,8 @@
 
 #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,
@@ -84,26 +84,20 @@ 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(key,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;