Introduce "BIO pairs", which (when finished) will relay data

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

diff --git a/crypto/evp/e_ecb_r2.c b/crypto/evp/e_ecb_r2.c
index e35b06dc6d7b8b4458cb4cfc68cbde8e5b9dd680..3c2330130d39165bd74da34e60db853adc36dd4c 100644 (file)
--- a/crypto/evp/e_ecb_r2.c
+++ b/crypto/evp/e_ecb_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_ecb_init_key(EVP_CIPHER_CTX *ctx, unsigned char *key,
        unsigned char *iv,int enc);
 static void rc2_ecb_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
        unsigned char *in, unsigned int inl);
-#else
-static void rc2_ecb_init_key();
-static void rc2_ecb_cipher();
-#endif
-
 static EVP_CIPHER r2_ecb_cipher=
        {
        NID_rc2_ecb,
@@ -86,27 +80,21 @@ static EVP_CIPHER r2_ecb_cipher=
        NULL,
        };
 
-EVP_CIPHER *EVP_rc2_ecb()
+EVP_CIPHER *EVP_rc2_ecb(void)
        {
        return(&r2_ecb_cipher);
        }
        
-static void rc2_ecb_init_key(ctx,key,iv,enc)
-EVP_CIPHER_CTX *ctx;
-unsigned char *key;
-unsigned char *iv;
-int enc;
+static void rc2_ecb_init_key(EVP_CIPHER_CTX *ctx, unsigned char *key,
+            unsigned char *iv, int enc)
        {
        if (key != NULL)
-               RC2_set_key(&(ctx->c.rc2_ks),EVP_RC2_KEY_SIZE,key,
-                       EVP_RC2_KEY_SIZE*8);
+               RC2_set_key(&(ctx->c.rc2_ks),EVP_CIPHER_CTX_key_length(ctx),
+                       key,EVP_CIPHER_CTX_key_length(ctx)*8);
        }
 
-static void rc2_ecb_cipher(ctx,out,in,inl)
-EVP_CIPHER_CTX *ctx;
-unsigned char *out;
-unsigned char *in;
-unsigned int inl;
+static void rc2_ecb_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
+            unsigned char *in, unsigned int inl)
        {
        unsigned int i;