A few train of thoughts about the build procedure mess

[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 a63c0f13f028e8ebe46c9cd01c5493f04b7f4d99..849be7e63889136daf17ae9e58d7804c6ac657e4 100644 (file)
--- a/crypto/evp/e_cfb_r2.c
+++ b/crypto/evp/e_cfb_r2.c
@@ -1,5 +1,5 @@
 /* crypto/evp/e_cfb_r2.c */
-/* Copyright (C) 1995-1997 Eric Young (eay@cryptsoft.com)
+/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
  * This package is an SSL implementation written
@@ -79,6 +79,11 @@ static EVP_CIPHER r2_cfb_cipher=
        1,EVP_RC2_KEY_SIZE,8,
        rc2_cfb_init_key,
        rc2_cfb_cipher,
+       NULL,
+       sizeof(EVP_CIPHER_CTX)-sizeof((((EVP_CIPHER_CTX *)NULL)->c))+
+               sizeof((((EVP_CIPHER_CTX *)NULL)->c.rc2_ks)),
+       EVP_CIPHER_set_asn1_iv,
+       EVP_CIPHER_get_asn1_iv,
        };
 
 EVP_CIPHER *EVP_rc2_cfb()
@@ -92,14 +97,14 @@ unsigned char *key;
 unsigned char *iv;
 int enc;
        {
-       ctx->c.rc2_cfb.num=0;
+       ctx->num=0;
 
        if (iv != NULL)
-               memcpy(&(ctx->c.rc2_cfb.oiv[0]),iv,8);
-       memcpy(&(ctx->c.rc2_cfb.iv[0]),&(ctx->c.rc2_cfb.oiv[0]),8);
+               memcpy(&(ctx->oiv[0]),iv,8);
+       memcpy(&(ctx->iv[0]),&(ctx->oiv[0]),8);
        if (key != NULL)
-               RC2_set_key(&(ctx->c.rc2_cfb.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_cfb_cipher(ctx,out,in,inl)
@@ -110,8 +115,8 @@ unsigned int inl;
        {
        RC2_cfb64_encrypt(
                in,out,
-               (long)inl, &(ctx->c.rc2_cfb.ks),
-               &(ctx->c.rc2_cfb.iv[0]),
-               &ctx->c.rc2_cfb.num,ctx->encrypt);
+               (long)inl, &(ctx->c.rc2_ks),
+               &(ctx->iv[0]),
+               &ctx->num,ctx->encrypt);
        }
 #endif