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

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

diff --git a/crypto/evp/e_cfb_c.c b/crypto/evp/e_cfb_c.c
index 936df55fd8e24eb38c7122768a0d88cf67a22241..0e77e69260c476e2b848b0b1a0dc7295e12542f2 100644 (file)
--- a/crypto/evp/e_cfb_c.c
+++ b/crypto/evp/e_cfb_c.c
@@ -60,8 +60,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 cast_cfb_init_key(EVP_CIPHER_CTX *ctx, unsigned char *key,
@@ -86,16 +86,13 @@ static EVP_CIPHER cast5_cfb_cipher=
        EVP_CIPHER_get_asn1_iv,
        };
 
-EVP_CIPHER *EVP_cast5_cfb()
+EVP_CIPHER *EVP_cast5_cfb(void)
        {
        return(&cast5_cfb_cipher);
        }
        
-static void cast_cfb_init_key(ctx,key,iv,enc)
-EVP_CIPHER_CTX *ctx;
-unsigned char *key;
-unsigned char *iv;
-int enc;
+static void cast_cfb_init_key(EVP_CIPHER_CTX *ctx, unsigned char *key,
+            unsigned char *iv, int enc)
        {
        ctx->num=0;
 
@@ -106,11 +103,8 @@ int enc;
                CAST_set_key(&(ctx->c.cast_ks),EVP_CAST5_KEY_SIZE,key);
        }
 
-static void cast_cfb_cipher(ctx,out,in,inl)
-EVP_CIPHER_CTX *ctx;
-unsigned char *out;
-unsigned char *in;
-unsigned int inl;
+static void cast_cfb_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
+            unsigned char *in, unsigned int inl)
        {
        CAST_cfb64_encrypt(
                in,out,