X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=crypto%2Fevp%2Fe_cfb_d.c;h=6bdf20b6460f567690ebc09faff5ad6f9ff13a28;hb=10cea23bd46cb43fab1de5c59828ae67f80975c3;hp=554815ec8abcd9549e3bd7395b8ea2c0f5450fad;hpb=4e31df2cd73dbb659fd8a6eca6270fac661c072d;p=oweals%2Fopenssl.git

diff --git a/crypto/evp/e_cfb_d.c b/crypto/evp/e_cfb_d.c
index 554815ec8a..6bdf20b646 100644
--- a/crypto/evp/e_cfb_d.c
+++ b/crypto/evp/e_cfb_d.c
@@ -58,19 +58,14 @@
 
 #include <stdio.h>
 #include "cryptlib.h"
-#include "evp.h"
-#include "objects.h"
+#include <openssl/evp.h>
+#include <openssl/objects.h>
 
-#ifndef NOPROTO
+#ifndef NO_DES
 static void des_cfb_init_key(EVP_CIPHER_CTX *ctx, unsigned char *key,
 	unsigned char *iv,int enc);
 static void des_cfb_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
 	unsigned char *in, unsigned int inl);
-#else
-static void des_cfb_init_key();
-static void des_cfb_cipher();
-#endif
-
 static EVP_CIPHER d_cfb_cipher=
 	{
 	NID_des_cfb64,
@@ -84,35 +79,32 @@ static EVP_CIPHER d_cfb_cipher=
 	EVP_CIPHER_get_asn1_iv,
 	};
 
-EVP_CIPHER *EVP_des_cfb()
+EVP_CIPHER *EVP_des_cfb(void)
 	{
 	return(&d_cfb_cipher);
 	}
 	
-static void des_cfb_init_key(ctx,key,iv,enc)
-EVP_CIPHER_CTX *ctx;
-unsigned char *key;
-unsigned char *iv;
-int enc;
+static void des_cfb_init_key(EVP_CIPHER_CTX *ctx, unsigned char *key,
+	     unsigned char *iv, int enc)
 	{
+	des_cblock *deskey = (des_cblock *)key;
+
 	ctx->num=0;
 
 	if (iv != NULL)
 		memcpy(&(ctx->oiv[0]),iv,8);
 	memcpy(&(ctx->iv[0]),&(ctx->oiv[0]),8);
-	if (key != NULL)
-		des_set_key(key,ctx->c.des_ks);
+	if (deskey != NULL)
+		des_set_key(deskey,ctx->c.des_ks);
 	}
 
-static void des_cfb_cipher(ctx,out,in,inl)
-EVP_CIPHER_CTX *ctx;
-unsigned char *out;
-unsigned char *in;
-unsigned int inl;
+static void des_cfb_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
+	     unsigned char *in, unsigned int inl)
 	{
 	des_cfb64_encrypt(
 		in,out,
 		(long)inl, ctx->c.des_ks,
-		&(ctx->iv[0]),
+		(des_cblock *)&(ctx->iv[0]),
 		&ctx->num,ctx->encrypt);
 	}
+#endif