Second phase of EVP cipher overhaul.

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

diff --git a/crypto/evp/e_cbc_c.c b/crypto/evp/e_cbc_c.c
index 4e8fda9e645d79d73b6022492ba7a2cef222ac6a..d910f67cc59fe24a896b820aea741a427efad148 100644 (file)
--- a/crypto/evp/e_cbc_c.c
+++ b/crypto/evp/e_cbc_c.c
@@ -63,9 +63,9 @@
 #include <openssl/evp.h>
 #include <openssl/objects.h>
 
-static void cast_cbc_init_key(EVP_CIPHER_CTX *ctx, unsigned char *key,
+static int cast_cbc_init_key(EVP_CIPHER_CTX *ctx, unsigned char *key,
        unsigned char *iv,int enc);
-static void cast_cbc_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
+static int cast_cbc_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
        unsigned char *in, unsigned int inl);
 static EVP_CIPHER cast5_cbc_cipher=
        {
@@ -87,7 +87,7 @@ EVP_CIPHER *EVP_cast5_cbc(void)
        return(&cast5_cbc_cipher);
        }
        
-static void cast_cbc_init_key(EVP_CIPHER_CTX *ctx, unsigned char *key,
+static int cast_cbc_init_key(EVP_CIPHER_CTX *ctx, unsigned char *key,
             unsigned char *iv, int enc)
        {
        if (iv != NULL)
@@ -95,15 +95,17 @@ static void cast_cbc_init_key(EVP_CIPHER_CTX *ctx, unsigned char *key,
        memcpy(&(ctx->iv[0]),&(ctx->oiv[0]),8);
        if (key != NULL)
                CAST_set_key(&(ctx->c.cast_ks),EVP_CIPHER_CTX_key_length(ctx),key);
+       return 1;
        }
 
-static void cast_cbc_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
+static int cast_cbc_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
             unsigned char *in, unsigned int inl)
        {
        CAST_cbc_encrypt(
                in,out,(long)inl,
                &(ctx->c.cast_ks),&(ctx->iv[0]),
                ctx->encrypt);
+       return 1;
        }
 
 #endif