Second phase of EVP cipher overhaul.

[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 4e74af96bdef8fd83b4e8746399588310db5a614..b6ff7b77a524137c2b17f493ffde732ad8b8155e 100644 (file)
--- a/crypto/evp/e_ecb_r2.c
+++ b/crypto/evp/e_ecb_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_ecb_init_key(EVP_CIPHER_CTX *ctx, unsigned char *key,
+static int 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,
+static int 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,
        8,EVP_RC2_KEY_SIZE,0,
+       EVP_CIPH_ECB_MODE | EVP_CIPH_VARIABLE_LENGTH,
        rc2_ecb_init_key,
        rc2_ecb_cipher,
        NULL,
@@ -84,33 +79,29 @@ static EVP_CIPHER r2_ecb_cipher=
                sizeof((((EVP_CIPHER_CTX *)NULL)->c.rc2_ks)),
        NULL,
        NULL,
+       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 int 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_CIPHER_CTX_key_length(ctx),
-                       key,EVP_CIPHER_CTX_key_length(ctx)*8);
+                       key,EVP_CIPHER_key_length(ctx->cipher)*8);
+       return 1;
        }
 
-static void rc2_ecb_cipher(ctx,out,in,inl)
-EVP_CIPHER_CTX *ctx;
-unsigned char *out;
-unsigned char *in;
-unsigned int inl;
+static int rc2_ecb_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
+            unsigned char *in, unsigned int inl)
        {
        unsigned int i;
 
-       if (inl < 8) return;
+       if (inl < 8) return 1;
        inl-=8;
        for (i=0; i<=inl; i+=8)
                {
@@ -118,6 +109,7 @@ unsigned int inl;
                        &(in[i]),&(out[i]),
                        &(ctx->c.rc2_ks),ctx->encrypt);
                }
+       return 1;
        }
 
 #endif