Addapt seldom compiled code to new semantics of the key schedule (not

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

diff --git a/crypto/des/cbc3_enc.c b/crypto/des/cbc3_enc.c
index 3863a676d4141af4dbbca7960a8ccdc8926d0c26..c7cc7c1706ac6b9d792bd64b50be317b6065597f 100644 (file)
--- a/crypto/des/cbc3_enc.c
+++ b/crypto/des/cbc3_enc.c
@@ -58,7 +58,7 @@
 
 #include "des_locl.h"
 
-/* HAS BUGS? DON'T USE - this is only present for use in des.c */
+/* 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)
@@ -69,11 +69,14 @@ void des_3cbc_encrypt(des_cblock *input, des_cblock *output, long length,
 
        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));
                }
@@ -81,11 +84,14 @@ void des_3cbc_encrypt(des_cblock *input, des_cblock *output, long length,
                {
                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));