Add an evil cast, because POSIX/SUSv2 define connect(2) require

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

diff --git a/crypto/evp/e_ofb_r2.c b/crypto/evp/e_ofb_r2.c
index 4ed67eacd5357c3f58612b1ff7c7b2dc4e1ea6eb..60ae3d4507a4e2b2c957df4c7d86fc78d5ee085e 100644 (file)
--- a/crypto/evp/e_ofb_r2.c
+++ b/crypto/evp/e_ofb_r2.c
@@ -60,19 +60,13 @@
 
 #include <stdio.h>
 #include "cryptlib.h"
-#include "evp.h"
-#include "objects.h"
+#include <openssl/evp.h>
+#include <openssl/objects.h>
 
-#ifndef NOPROTO
 static void rc2_ofb_init_key(EVP_CIPHER_CTX *ctx, unsigned char *key,
        unsigned char *iv,int enc);
 static void rc2_ofb_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
        unsigned char *in, unsigned int inl);
-#else
-static void rc2_ofb_init_key();
-static void rc2_ofb_cipher();
-#endif
-
 static EVP_CIPHER r2_ofb_cipher=
        {
        NID_rc2_ofb64,
@@ -86,16 +80,13 @@ static EVP_CIPHER r2_ofb_cipher=
        EVP_CIPHER_get_asn1_iv,
        };
 
-EVP_CIPHER *EVP_rc2_ofb()
+EVP_CIPHER *EVP_rc2_ofb(void)
        {
        return(&r2_ofb_cipher);
        }
        
-static void rc2_ofb_init_key(ctx,key,iv,enc)
-EVP_CIPHER_CTX *ctx;
-unsigned char *key;
-unsigned char *iv;
-int enc;
+static void rc2_ofb_init_key(EVP_CIPHER_CTX *ctx, unsigned char *key,
+            unsigned char *iv, int enc)
        {
        ctx->num=0;
 
@@ -107,11 +98,8 @@ int enc;
                        key,EVP_CIPHER_CTX_key_length(ctx)*8);
        }
 
-static void rc2_ofb_cipher(ctx,out,in,inl)
-EVP_CIPHER_CTX *ctx;
-unsigned char *out;
-unsigned char *in;
-unsigned int inl;
+static void rc2_ofb_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
+            unsigned char *in, unsigned int inl)
        {
        RC2_ofb64_encrypt(
                in,out,