OpenSSL 0.9.4 merge

1 files changed, 6 insertions, 10 deletions

diff --git a/src/lib/libcrypto/des/qud_cksm.c b/src/lib/libcrypto/des/qud_cksm.c
index 8526abf334..6ce8c61b42 100644
--- a/src/lib/libcrypto/des/qud_cksm.c
+++ b/src/lib/libcrypto/des/qud_cksm.c
@@ -73,28 +73,24 @@
 /* Got the value MIT uses via brute force :-) 2/10/90 eay */
 #define NOISE   ((DES_LONG)83653421L)
 
-DES_LONG des_quad_cksum(input, output, length, out_count, seed)
-des_cblock (*input);
-des_cblock (*output);
-long length;
-int out_count;
-des_cblock (*seed);
+DES_LONG des_quad_cksum(const unsigned char *input, des_cblock output[],
+             long length, int out_count, des_cblock *seed)
         {
         DES_LONG z0,z1,t0,t1;
         int i;
         long l;
-        unsigned char *cp;
+        const unsigned char *cp;
         unsigned char *lp;
 
         if (out_count < 1) out_count=1;
-        lp=(unsigned char *)output;
+        lp = &(output[0])[0];
 
         z0=Q_B0((*seed)[0])|Q_B1((*seed)[1])|Q_B2((*seed)[2])|Q_B3((*seed)[3]);
         z1=Q_B0((*seed)[4])|Q_B1((*seed)[5])|Q_B2((*seed)[6])|Q_B3((*seed)[7]);
 
         for (i=0; ((i<4)&&(i<out_count)); i++)
                 {
-                cp=(unsigned char *)input;
+                cp=input;
                 l=length;
                 while (l > 0)
                         {
@@ -133,7 +129,7 @@ des_cblock (*seed);
                                 }
                         else
                                 {
-                                lp=output[out_count-i-1];
+                                lp = &(output[out_count-i-1])[0];
                                 l2n(z1,lp);
                                 l2n(z0,lp);
                                 }