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

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

diff --git a/crypto/evp/e_cfb_3d.c b/crypto/evp/e_cfb_3d.c
index 88ace5c54383c23c1c2c78c525e31f40e598d6c8..a0321fa1330923ff5706475211713ce354a36a2f 100644 (file)
--- a/crypto/evp/e_cfb_3d.c
+++ b/crypto/evp/e_cfb_3d.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_ede_cfb_init_key(EVP_CIPHER_CTX *ctx, unsigned char *key,
@@ -100,21 +100,18 @@ static EVP_CIPHER d_ede3_cfb_cipher3=
        EVP_CIPHER_get_asn1_iv,
        };
 
-EVP_CIPHER *EVP_des_ede_cfb()
+EVP_CIPHER *EVP_des_ede_cfb(void)
        {
        return(&d_ede_cfb_cipher2);
        }
 
-EVP_CIPHER *EVP_des_ede3_cfb()
+EVP_CIPHER *EVP_des_ede3_cfb(void)
        {
        return(&d_ede3_cfb_cipher3);
        }
        
-static void des_ede_cfb_init_key(ctx,key,iv,enc)
-EVP_CIPHER_CTX *ctx;
-unsigned char *key;
-unsigned char *iv;
-int enc;
+static void des_ede_cfb_init_key(EVP_CIPHER_CTX *ctx, unsigned char *key,
+            unsigned char *iv, int enc)
        {
        ctx->num=0;
 
@@ -131,11 +128,8 @@ int enc;
                }
        }
 
-static void des_ede3_cfb_init_key(ctx,key,iv,enc)
-EVP_CIPHER_CTX *ctx;
-unsigned char *key;
-unsigned char *iv;
-int enc;
+static void des_ede3_cfb_init_key(EVP_CIPHER_CTX *ctx, unsigned char *key,
+            unsigned char *iv, int enc)
        {
        ctx->num=0;
 
@@ -150,11 +144,8 @@ int enc;
                }
        }
 
-static void des_ede_cfb_cipher(ctx,out,in,inl)
-EVP_CIPHER_CTX *ctx;
-unsigned char *out;
-unsigned char *in;
-unsigned int inl;
+static void des_ede_cfb_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
+            unsigned char *in, unsigned int inl)
        {
        des_ede3_cfb64_encrypt(in,out,(long)inl,
                               ctx->c.des_ede.ks1,