More Win32 fixes and upsdate INSTALL.W32 documentation.

[openssl.git] / crypto / rand / md_rand.c

diff --git a/crypto/rand/md_rand.c b/crypto/rand/md_rand.c
index 35defdea30c9412beb587dd908a6dedd4885554f..bef42459109c713cf8aaef4de6a5e2efd9921eb0 100644 (file)
--- a/crypto/rand/md_rand.c
+++ b/crypto/rand/md_rand.c
@@ -57,9 +57,11 @@
  */
 
 #include <stdio.h>
-#include "cryptlib.h"
 #include <sys/types.h>
 #include <time.h>
+#include <string.h>
+#include "e_os.h"
+#include "crypto.h"
 
 #if !defined(USE_MD5_RAND) && !defined(USE_SHA1_RAND) && !defined(USE_MDC2_RAND) && !defined(USE_MD2_RAND)
 #ifndef NO_MD5
@@ -126,13 +128,13 @@ static unsigned char state[STATE_SIZE+MD_DIGEST_LENGTH];
 static unsigned char md[MD_DIGEST_LENGTH];
 static long md_count[2]={0,0};
 
-char *RAND_version="RAND part of SSLeay 0.9.1a 06-Jul-1998";
+char *RAND_version="RAND part of OpenSSL 0.9.2 31-Dec-1998";
 
 static void ssleay_rand_cleanup(void);
-static void ssleay_rand_seed(unsigned char *buf, int num);
+static void ssleay_rand_seed(const void *buf, int num);
 static void ssleay_rand_bytes(unsigned char *buf, int num);
 
-RAND_METHOD rand_ssleay={
+RAND_METHOD rand_ssleay_meth={
        ssleay_rand_seed,
        ssleay_rand_bytes,
        ssleay_rand_cleanup,
@@ -140,7 +142,7 @@ RAND_METHOD rand_ssleay={
 
 RAND_METHOD *RAND_SSLeay()
        {
-       return(&rand_ssleay);
+       return(&rand_ssleay_meth);
        }
 
 static void ssleay_rand_cleanup()
@@ -154,7 +156,7 @@ static void ssleay_rand_cleanup()
        }
 
 static void ssleay_rand_seed(buf,num)
-unsigned char *buf;
+const void *buf;
 int num;
        {
        int i,j,k,st_idx,st_num;
@@ -202,7 +204,7 @@ int num;
                MD_Final(md,&m);
                md_count[1]++;
 
-               buf+=j;
+               buf=(char *)buf + j;
 
                for (k=0; k<j; k++)
                        {
@@ -247,15 +249,15 @@ int num;
                CRYPTO_w_unlock(CRYPTO_LOCK_RAND);
                /* put in some default random data, we need more than
                 * just this */
-               RAND_seed((unsigned char *)&m,sizeof(m));
+               RAND_seed(&m,sizeof(m));
 #ifndef MSDOS
                l=getpid();
-               RAND_seed((unsigned char *)&l,sizeof(l));
+               RAND_seed(&l,sizeof(l));
                l=getuid();
-               RAND_seed((unsigned char *)&l,sizeof(l));
+               RAND_seed(&l,sizeof(l));
 #endif
                l=time(NULL);
-               RAND_seed((unsigned char *)&l,sizeof(l));
+               RAND_seed(&l,sizeof(l));
 
 /* #ifdef DEVRANDOM */
                /*