Third phase of EVP cipher overhaul.

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

diff --git a/crypto/evp/e_cfb_c.c b/crypto/evp/e_cfb_c.c
index d29e5948a4ccdbc95e23c4680c941e62405c56b1..bbdeac24f48bf2830a40e10dbb68af9f855315a0 100644 (file)
--- a/crypto/evp/e_cfb_c.c
+++ b/crypto/evp/e_cfb_c.c
@@ -90,13 +90,7 @@ EVP_CIPHER *EVP_cast5_cfb(void)
 static int cast_cfb_init_key(EVP_CIPHER_CTX *ctx, unsigned char *key,
             unsigned char *iv, int enc)
        {
-       ctx->num=0;
-
-       if (iv != NULL)
-               memcpy(&(ctx->oiv[0]),iv,8);
-       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);
+       CAST_set_key(&(ctx->c.cast_ks),EVP_CIPHER_CTX_key_length(ctx),key);
        return 1;
        }