OpenSSL 0.9.4 merge

1 files changed, 7 insertions, 19 deletions

diff --git a/src/lib/libcrypto/evp/e_ofb_r5.c b/src/lib/libcrypto/evp/e_ofb_r5.c
index db28d6c317..30136824eb 100644
--- a/src/lib/libcrypto/evp/e_ofb_r5.c
+++ b/src/lib/libcrypto/evp/e_ofb_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_ofb_init_key(EVP_CIPHER_CTX *ctx, unsigned char *key,
         unsigned char *iv,int enc);
 static void rc5_32_12_16_ofb_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
         unsigned char *in, unsigned int inl);
-#else
-static void rc5_32_12_16_ofb_init_key();
-static void rc5_32_12_16_ofb_cipher();
-#endif
-
 static EVP_CIPHER rc5_ofb_cipher=
         {
         NID_rc5_ofb64,
@@ -86,16 +80,13 @@ static EVP_CIPHER rc5_ofb_cipher=
         EVP_CIPHER_get_asn1_iv,
         };
 
-EVP_CIPHER *EVP_rc5_32_12_16_ofb()
+EVP_CIPHER *EVP_rc5_32_12_16_ofb(void)
         {
         return(&rc5_ofb_cipher);
         }
         
-static void rc5_32_12_16_ofb_init_key(ctx,key,iv,enc)
-EVP_CIPHER_CTX *ctx;
-unsigned char *key;
-unsigned char *iv;
-int enc;
+static void rc5_32_12_16_ofb_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_ofb_cipher(ctx,out,in,inl)
-EVP_CIPHER_CTX *ctx;
-unsigned char *out;
-unsigned char *in;
-unsigned int inl;
+static void rc5_32_12_16_ofb_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
+             unsigned char *in, unsigned int inl)
         {
         RC5_32_ofb64_encrypt(
                 in,out,