Beginnings of EVP cipher overhaul. This should eventually

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

diff --git a/crypto/evp/e_cfb_r2.c b/crypto/evp/e_cfb_r2.c
index 849be7e63889136daf17ae9e58d7804c6ac657e4..6e5ee8dac692ad53f994c33e60bb34d2f67eb98b 100644 (file)
--- a/crypto/evp/e_cfb_r2.c
+++ b/crypto/evp/e_cfb_r2.c
@@ -60,23 +60,18 @@
 
 #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_cfb_init_key(EVP_CIPHER_CTX *ctx, unsigned char *key,
        unsigned char *iv,int enc);
 static void rc2_cfb_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
        unsigned char *in, unsigned int inl);
-#else
-static void rc2_cfb_init_key();
-static void rc2_cfb_cipher();
-#endif
-
 static EVP_CIPHER r2_cfb_cipher=
        {
        NID_rc2_cfb64,
        1,EVP_RC2_KEY_SIZE,8,
+       EVP_CIPH_CFB_MODE | EVP_CIPH_VARIABLE_LENGTH,
        rc2_cfb_init_key,
        rc2_cfb_cipher,
        NULL,
@@ -84,18 +79,16 @@ static EVP_CIPHER r2_cfb_cipher=
                sizeof((((EVP_CIPHER_CTX *)NULL)->c.rc2_ks)),
        EVP_CIPHER_set_asn1_iv,
        EVP_CIPHER_get_asn1_iv,
+       NULL
        };
 
-EVP_CIPHER *EVP_rc2_cfb()
+EVP_CIPHER *EVP_rc2_cfb(void)
        {
        return(&r2_cfb_cipher);
        }
        
-static void rc2_cfb_init_key(ctx,key,iv,enc)
-EVP_CIPHER_CTX *ctx;
-unsigned char *key;
-unsigned char *iv;
-int enc;
+static void rc2_cfb_init_key(EVP_CIPHER_CTX *ctx, unsigned char *key,
+            unsigned char *iv, int enc)
        {
        ctx->num=0;
 
@@ -104,14 +97,11 @@ int enc;
        memcpy(&(ctx->iv[0]),&(ctx->oiv[0]),8);
        if (key != NULL)
                RC2_set_key(&(ctx->c.rc2_ks),EVP_CIPHER_CTX_key_length(ctx),
-                       key,EVP_CIPHER_CTX_key_length(ctx)*8);
+                       key,EVP_CIPHER_key_length(ctx->cipher)*8);
        }
 
-static void rc2_cfb_cipher(ctx,out,in,inl)
-EVP_CIPHER_CTX *ctx;
-unsigned char *out;
-unsigned char *in;
-unsigned int inl;
+static void rc2_cfb_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
+            unsigned char *in, unsigned int inl)
        {
        RC2_cfb64_encrypt(
                in,out,