Fix the Win32 compile environment and add various changes so it will now compile

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

diff --git a/crypto/evp/e_xcbc_d.c b/crypto/evp/e_xcbc_d.c
index 0d7fda0c47f883c1d14e1bb9f5020e6839a7f75c..b0bae80970afee9316d137fa61774ae1de96bff8 100644 (file)
--- a/crypto/evp/e_xcbc_d.c
+++ b/crypto/evp/e_xcbc_d.c
@@ -100,7 +100,7 @@ int enc;
        memcpy(&(ctx->iv[0]),&(ctx->oiv[0]),8);
        if (key != NULL)
                {
-               des_set_key((des_cblock *)key,ctx->c.desx_cbc.ks);
+               des_set_key(key,ctx->c.desx_cbc.ks);
                memcpy(&(ctx->c.desx_cbc.inw[0]),&(key[8]),8);
                memcpy(&(ctx->c.desx_cbc.outw[0]),&(key[16]),8);
                }
@@ -112,11 +112,9 @@ unsigned char *out;
 unsigned char *in;
 unsigned int inl;
        {
-       des_xcbc_encrypt(
-               (des_cblock *)in,(des_cblock *)out,
-               (long)inl, ctx->c.desx_cbc.ks,
-               (des_cblock *)&(ctx->iv[0]),
-               (des_cblock *)&(ctx->c.desx_cbc.inw[0]),
-               (des_cblock *)&(ctx->c.desx_cbc.outw[0]),
+       des_xcbc_encrypt(in,out,inl,ctx->c.desx_cbc.ks,
+               &(ctx->iv[0]),
+               &(ctx->c.desx_cbc.inw[0]),
+               &(ctx->c.desx_cbc.outw[0]),
                ctx->encrypt);
        }