X-Git-Url: https://git.openssl.org/gitweb/?p=openssl.git;a=blobdiff_plain;f=crypto%2Fevp%2Fe_ofb_3d.c;h=a3981288f1ce05d4db736c1b9eee453c7d56c356;hp=c3add18e936ce04cfb7cbc83249a854f83ae82d2;hb=08853ba82d38548a9e178bd6506a0a8c0deade34;hpb=c09c3c4b2fd262905ed1f1666145c32cd2b91f00 diff --git a/crypto/evp/e_ofb_3d.c b/crypto/evp/e_ofb_3d.c index c3add18e93..a3981288f1 100644 --- a/crypto/evp/e_ofb_3d.c +++ b/crypto/evp/e_ofb_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,10 +156,7 @@ unsigned char *out; unsigned char *in; unsigned int inl; { - des_ede3_ofb64_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); + des_ede3_ofb64_encrypt(in,out,inl,ctx->c.des_ede.ks1, + ctx->c.des_ede.ks2, ctx->c.des_ede.ks3, + &(ctx->iv[0]),&ctx->num); }