This commit ties the new DSO code (crypto/dso/) into the build for a

[openssl.git] / crypto / des / cbc3_enc.c

diff --git a/crypto/des/cbc3_enc.c b/crypto/des/cbc3_enc.c
index 92a78b05d6ca5109d20b1015836f838f8c3b461c..527e74f3dedf37d0e4cbb4c538312d4bbfdcdb72 100644 (file)
--- a/crypto/des/cbc3_enc.c
+++ b/crypto/des/cbc3_enc.c
@@ -58,16 +58,10 @@
 
 #include "des_locl.h"
 
-/* HAS BUGS? DON'T USE - this is only present for use in des.c */
-void des_3cbc_encrypt(input, output, length, ks1, ks2, iv1, iv2, enc)
-des_cblock (*input);
-des_cblock (*output);
-long length;
-des_key_schedule ks1;
-des_key_schedule ks2;
-des_cblock (*iv1);
-des_cblock (*iv2);
-int enc;
+/* HAS BUGS! DON'T USE - this is only present for use in des.c */
+void des_3cbc_encrypt(des_cblock *input, des_cblock *output, long length,
+            des_key_schedule ks1, des_key_schedule ks2, des_cblock *iv1,
+            des_cblock *iv2, int enc)
        {
        int off=((int)length-1)/8;
        long l8=((length+7)/8)*8;
@@ -75,11 +69,14 @@ int enc;
 
        if (enc == DES_ENCRYPT)
                {
-               des_cbc_encrypt(input,output,length,ks1,iv1,enc);
+               des_cbc_encrypt((unsigned char*)input,
+                               (unsigned char*)output,length,ks1,iv1,enc);
                if (length >= sizeof(des_cblock))
                        memcpy(niv1,output[off],sizeof(des_cblock));
-               des_cbc_encrypt(output,output,l8,ks2,iv1,!enc);
-               des_cbc_encrypt(output,output,l8,ks1,iv2, enc);
+               des_cbc_encrypt((unsigned char*)output,
+                               (unsigned char*)output,l8,ks2,iv1,!enc);
+               des_cbc_encrypt((unsigned char*)output,
+                               (unsigned char*)output,l8,ks1,iv2,enc);
                if (length >= sizeof(des_cblock))
                        memcpy(niv2,output[off],sizeof(des_cblock));
                }
@@ -87,11 +84,14 @@ int enc;
                {
                if (length >= sizeof(des_cblock))
                        memcpy(niv2,input[off],sizeof(des_cblock));
-               des_cbc_encrypt(input,output,l8,ks1,iv2,enc);
-               des_cbc_encrypt(output,output,l8,ks2,iv1,!enc);
+               des_cbc_encrypt((unsigned char*)input,
+                               (unsigned char*)output,l8,ks1,iv2,enc);
+               des_cbc_encrypt((unsigned char*)output,
+                               (unsigned char*)output,l8,ks2,iv1,!enc);
                if (length >= sizeof(des_cblock))
                        memcpy(niv1,output[off],sizeof(des_cblock));
-               des_cbc_encrypt(output,output,length,ks1,iv1, enc);
+               des_cbc_encrypt((unsigned char*)output,
+                               (unsigned char*)output,length,ks1,iv1,enc);
                }
        memcpy(*iv1,niv1,sizeof(des_cblock));
        memcpy(*iv2,niv2,sizeof(des_cblock));