Fix security hole.

[oweals/openssl.git] / crypto / evp / e_cfb_3d.c

diff --git a/crypto/evp/e_cfb_3d.c b/crypto/evp/e_cfb_3d.c
index e7e3419411dcc043896f54b8e31282b033e96d04..88ace5c54383c23c1c2c78c525e31f40e598d6c8 100644 (file)
--- a/crypto/evp/e_cfb_3d.c
+++ b/crypto/evp/e_cfb_3d.c
@@ -123,8 +123,8 @@ int enc;
        memcpy(&(ctx->iv[0]),&(ctx->oiv[0]),8);
        if (key != NULL)
                {
-               des_set_key((des_cblock *)key,ctx->c.des_ede.ks1);
-               des_set_key((des_cblock *)&(key[8]),ctx->c.des_ede.ks2);
+               des_set_key(key,ctx->c.des_ede.ks1);
+               des_set_key(&(key[8]),ctx->c.des_ede.ks2);
                memcpy( (char *)ctx->c.des_ede.ks3,
                        (char *)ctx->c.des_ede.ks1,
                        sizeof(ctx->c.des_ede.ks1));
@@ -144,9 +144,9 @@ int enc;
        memcpy(&(ctx->iv[0]),&(ctx->oiv[0]),8);
        if (key != NULL)
                {
-               des_set_key((des_cblock *)key,ctx->c.des_ede.ks1);
-               des_set_key((des_cblock *)&(key[8]),ctx->c.des_ede.ks2);
-               des_set_key((des_cblock *)&(key[16]),ctx->c.des_ede.ks3);
+               des_set_key(key,ctx->c.des_ede.ks1);
+               des_set_key(&(key[8]),ctx->c.des_ede.ks2);
+               des_set_key(&(key[16]),ctx->c.des_ede.ks3);
                }
        }
 
@@ -156,11 +156,9 @@ unsigned char *out;
 unsigned char *in;
 unsigned int inl;
        {
-       des_ede3_cfb64_encrypt(
-               in,out,(long)inl,
-               ctx->c.des_ede.ks1,
-               ctx->c.des_ede.ks2,
-               ctx->c.des_ede.ks3,
-               (des_cblock *)&(ctx->iv[0]),
-               &ctx->num,ctx->encrypt);
+       des_ede3_cfb64_encrypt(in,out,(long)inl,
+                              ctx->c.des_ede.ks1,
+                              ctx->c.des_ede.ks2,
+                              ctx->c.des_ede.ks3,
+                              &(ctx->iv[0]),&ctx->num,ctx->encrypt);
        }