OpenSSL 0.9.5 merge

*warning* this bumps shared lib minors for libssl and libcrypto from 2.1 to 2.2
if you are using the ssl26 packages for ssh and other things to work you will
need to get new ones (see ~beck/libsslsnap/<arch>) on cvs or ~beck/src-patent.tar.gz on cvs

1 files changed, 13 insertions, 7 deletions

diff --git a/src/lib/libcrypto/des/cbc3_enc.c b/src/lib/libcrypto/des/cbc3_enc.c
index 3863a676d4..527e74f3de 100644
--- a/src/lib/libcrypto/des/cbc3_enc.c
+++ b/src/lib/libcrypto/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));