Remove NOPROTO definitions and error code comments.

[openssl.git] / crypto / evp / e_cfb_r5.c

diff --git a/crypto/evp/e_cfb_r5.c b/crypto/evp/e_cfb_r5.c
index a2fddaedc0da06ada7854e104ed2ae67a130b58c..8e797289467a047880a792f93c6dbff9aeb1dbb8 100644 (file)
--- a/crypto/evp/e_cfb_r5.c
+++ b/crypto/evp/e_cfb_r5.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 rc5_32_12_16_cfb_init_key(EVP_CIPHER_CTX *ctx, unsigned char *key,
        unsigned char *iv,int enc);
 static void rc5_32_12_16_cfb_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
        unsigned char *in, unsigned int inl);
-#else
-static void rc5_32_12_16_cfb_init_key();
-static void rc5_32_12_16_cfb_cipher();
-#endif
-
 static EVP_CIPHER rc5_cfb_cipher=
        {
        NID_rc5_cfb64,
@@ -86,16 +80,13 @@ static EVP_CIPHER rc5_cfb_cipher=
        EVP_CIPHER_get_asn1_iv,
        };
 
-EVP_CIPHER *EVP_rc5_32_12_16_cfb()
+EVP_CIPHER *EVP_rc5_32_12_16_cfb(void)
        {
        return(&rc5_cfb_cipher);
        }
        
-static void rc5_32_12_16_cfb_init_key(ctx,key,iv,enc)
-EVP_CIPHER_CTX *ctx;
-unsigned char *key;
-unsigned char *iv;
-int enc;
+static void rc5_32_12_16_cfb_init_key(EVP_CIPHER_CTX *ctx, unsigned char *key,
+            unsigned char *iv, int enc)
        {
        ctx->num=0;
 
@@ -107,11 +98,8 @@ int enc;
                        RC5_12_ROUNDS);
        }
 
-static void rc5_32_12_16_cfb_cipher(ctx,out,in,inl)
-EVP_CIPHER_CTX *ctx;
-unsigned char *out;
-unsigned char *in;
-unsigned int inl;
+static void rc5_32_12_16_cfb_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
+            unsigned char *in, unsigned int inl)
        {
        RC5_32_cfb64_encrypt(
                in,out,