OpenSSL 0.9.5a merge

1 files changed, 10 insertions, 21 deletions

diff --git a/src/lib/libcrypto/des/qud_cksm.c b/src/lib/libcrypto/des/qud_cksm.c
index 6ce8c61b42..5f0ec5387f 100644
--- a/src/lib/libcrypto/des/qud_cksm.c
+++ b/src/lib/libcrypto/des/qud_cksm.c
@@ -80,10 +80,14 @@ DES_LONG des_quad_cksum(const unsigned char *input, des_cblock output[],
         int i;
         long l;
         const unsigned char *cp;
-        unsigned char *lp;
+#ifdef _CRAY
+        short *lp;
+#else
+        DES_LONG *lp;
+#endif
 
         if (out_count < 1) out_count=1;
-        lp = &(output[0])[0];
+        lp = (DES_LONG *) &(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]);
@@ -114,25 +118,10 @@ DES_LONG des_quad_cksum(const unsigned char *input, des_cblock output[],
                         }
                 if (lp != NULL)
                         {
-                        /* I believe I finally have things worked out.
-                         * The MIT library assumes that the checksum
-                         * is one huge number and it is returned in a
-                         * host dependant byte order.
-                         */
-                        static DES_LONG ltmp=1;
-                        static unsigned char *c=(unsigned char *)&ltmp;
-
-                        if (c[0])
-                                {
-                                l2c(z0,lp);
-                                l2c(z1,lp);
-                                }
-                        else
-                                {
-                                lp = &(output[out_count-i-1])[0];
-                                l2n(z1,lp);
-                                l2n(z0,lp);
-                                }
+                        /* The MIT library assumes that the checksum is
+                         * composed of 2*out_count 32 bit ints */
+                        *lp++ = z0;
+                        *lp++ = z1;
                         }
                 }
         return(z0);