More exactitude with function arguments.

diff --git a/crypto/bn/bn_rand.c b/crypto/bn/bn_rand.c
index 75b6b0493b1015da080b9c93cf81733737d77417..7b21821fe66ff0b820e0c8d1aafc696e7922b7ca 100644 (file)
--- a/crypto/bn/bn_rand.c
+++ b/crypto/bn/bn_rand.c
@@ -85,7 +85,7 @@ int bottom;
 
        /* make a random number and set the top and bottom bits */
        time(&tim);
-       RAND_seed((unsigned char *)&tim,sizeof(tim));
+       RAND_seed(&tim,sizeof(tim));
 
        RAND_bytes(buf,(int)bytes);
        if (top)

diff --git a/crypto/md5/md5.h b/crypto/md5/md5.h
index 357c6c625de3f0a0b670868a5e95df514eaa3fd0..93e65731a335e681d5066d055e7caeb20dc95856 100644 (file)
--- a/crypto/md5/md5.h
+++ b/crypto/md5/md5.h
@@ -80,7 +80,7 @@ typedef struct MD5state_st
 
 #ifndef NOPROTO
 void MD5_Init(MD5_CTX *c);
-void MD5_Update(MD5_CTX *c, unsigned char *data, unsigned long len);
+void MD5_Update(MD5_CTX *c, const void *data, unsigned long len);
 void MD5_Final(unsigned char *md, MD5_CTX *c);
 unsigned char *MD5(unsigned char *d, unsigned long n, unsigned char *md);
 void MD5_Transform(MD5_CTX *c, unsigned char *b);

diff --git a/crypto/md5/md5_dgst.c b/crypto/md5/md5_dgst.c
index ffc870284bc3a3628188778767ee673f841556b6..78d8b9e0f6c9db64718dadd442d595bdd58347db 100644 (file)
--- a/crypto/md5/md5_dgst.c
+++ b/crypto/md5/md5_dgst.c
@@ -97,11 +97,12 @@ MD5_CTX *c;
        c->num=0;
        }
 
-void MD5_Update(c, data, len)
+void MD5_Update(c, _data, len)
 MD5_CTX *c;
-register unsigned char *data;
+const void *_data;
 unsigned long len;
        {
+       register const unsigned char *data=_data;
        register ULONG *p;
        int sw,sc;
        ULONG l;

diff --git a/crypto/rand/md_rand.c b/crypto/rand/md_rand.c
index c52d89babb0a95914aa7d2c3568b043885f2e843..b04bb1e158276a7bf30b0faf4396b73b71d950ca 100644 (file)
--- a/crypto/rand/md_rand.c
+++ b/crypto/rand/md_rand.c
@@ -131,7 +131,7 @@ static long md_count[2]={0,0};
 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_meth={
@@ -156,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;
@@ -249,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 */
                /* 

diff --git a/crypto/rand/rand.h b/crypto/rand/rand.h
index 34ef90373e70d1da312af114b70e73034a64ce31..7baac68ee52af637f1ffa17b45c05ee41b6854a6 100644 (file)
--- a/crypto/rand/rand.h
+++ b/crypto/rand/rand.h
@@ -66,7 +66,7 @@ extern "C" {
 typedef struct rand_meth_st
        {
 #ifndef NOPROTO
-       void (*seed)(unsigned char *buf, int num);
+       void (*seed)(const void *buf, int num);
        void (*bytes)(unsigned char *buf, int num);
        void (*cleanup)(void);
 #else
@@ -81,8 +81,8 @@ void RAND_set_rand_method(RAND_METHOD *meth);
 RAND_METHOD *RAND_get_rand_method(void );
 RAND_METHOD *RAND_SSLeay(void);
 void RAND_cleanup(void );
-void RAND_bytes( unsigned char *buf,int num);
-void RAND_seed( unsigned char *buf,int num);
+void RAND_bytes(unsigned char *buf,int num);
+void RAND_seed(const void *buf,int num);
 int  RAND_load_file(const char *file,long max_bytes);
 int  RAND_write_file(const char *file);
 char *RAND_file_name(char *file,int num);

diff --git a/crypto/rand/rand_lib.c b/crypto/rand/rand_lib.c
index 4503215e1d7976e6ba884b917dbdf4941c74a9a0..6bea09211cee76baf85fcac841b88a6fed92018b 100644 (file)
--- a/crypto/rand/rand_lib.c
+++ b/crypto/rand/rand_lib.c
@@ -57,7 +57,6 @@
  */
 
 #include <stdio.h>
-#include "cryptlib.h"
 #include <sys/types.h>
 #include <time.h>
 #include "rand.h"
@@ -87,7 +86,7 @@ void RAND_cleanup()
        }
 
 void RAND_seed(buf,num)
-unsigned char *buf;
+const void *buf;
 int num;
        {
        if (rand_meth != NULL)

diff --git a/crypto/rand/randfile.c b/crypto/rand/randfile.c
index 8ee23b61d112d0c5f40e36121bea4e9c6d8db829..3ae95f9012f1f3acb51a3787517a93d3815d1acb 100644 (file)
--- a/crypto/rand/randfile.c
+++ b/crypto/rand/randfile.c
@@ -84,7 +84,7 @@ long bytes;
 
        i=stat(file,&sb);
        /* If the state fails, put some crap in anyway */
-       RAND_seed((unsigned char *)&sb,sizeof(sb));
+       RAND_seed(&sb,sizeof(sb));
        ret+=sizeof(sb);
        if (i < 0) return(0);
        if (bytes <= 0) return(ret);

diff --git a/ssl/s23_clnt.c b/ssl/s23_clnt.c
index b607f623e46203df28ffb2200f9171d0ff6b52c6..1b4c06838bf5f0c5e571eef7b7cabeef8f0c8f71 100644 (file)
--- a/ssl/s23_clnt.c
+++ b/ssl/s23_clnt.c
@@ -113,7 +113,7 @@ SSL *s;
        int ret= -1;
        int new_state,state;
 
-       RAND_seed((unsigned char *)&Time,sizeof(Time));
+       RAND_seed(&Time,sizeof(Time));
        ERR_clear_error();
        clear_sys_error();
 

diff --git a/ssl/s23_srvr.c b/ssl/s23_srvr.c
index 5dd9253f9fcc6687155855ff88a42a7117c1dd35..6c8afeb8576a7bd8bb42c4149e417e69aa77fe3f 100644 (file)
--- a/ssl/s23_srvr.c
+++ b/ssl/s23_srvr.c
@@ -111,7 +111,7 @@ SSL *s;
        int ret= -1;
        int new_state,state;
 
-       RAND_seed((unsigned char *)&Time,sizeof(Time));
+       RAND_seed(&Time,sizeof(Time));
        ERR_clear_error();
        clear_sys_error();
 

diff --git a/ssl/s2_clnt.c b/ssl/s2_clnt.c
index 91fea92e6b5f8a344272bb858a988b5005bceaa1..0c138420145a9d52a8adcac17ee8e18827916a47 100644 (file)
--- a/ssl/s2_clnt.c
+++ b/ssl/s2_clnt.c
@@ -122,7 +122,7 @@ SSL *s;
        void (*cb)()=NULL;
        int new_state,state;
 
-       RAND_seed((unsigned char *)&l,sizeof(l));
+       RAND_seed(&l,sizeof(l));
        ERR_clear_error();
        clear_sys_error();
 

diff --git a/ssl/s2_srvr.c b/ssl/s2_srvr.c
index 3477d438530319878aa48ffcf016e4bb4b5a557c..7e8732f9cc275e7baa5837b1150e52831daf2c3d 100644 (file)
--- a/ssl/s2_srvr.c
+++ b/ssl/s2_srvr.c
@@ -123,7 +123,7 @@ SSL *s;
        void (*cb)()=NULL;
        int new_state,state;
 
-       RAND_seed((unsigned char *)&l,sizeof(l));
+       RAND_seed(&l,sizeof(l));
        ERR_clear_error();
        clear_sys_error();
 

diff --git a/ssl/s3_clnt.c b/ssl/s3_clnt.c
index 88f33d5162a5b113f22af89c4ab63f4fc4126aad..436215094a9d0178f2ad0564ca158c1ac7f17c53 100644 (file)
--- a/ssl/s3_clnt.c
+++ b/ssl/s3_clnt.c
@@ -137,7 +137,7 @@ SSL *s;
        BIO *under;
        int new_state,state,skip=0;;
 
-       RAND_seed((unsigned char *)&Time,sizeof(Time));
+       RAND_seed(&Time,sizeof(Time));
        ERR_clear_error();
        clear_sys_error();
 

diff --git a/ssl/s3_srvr.c b/ssl/s3_srvr.c
index 9bb4560e322fa468ce3963dedb257eb269165376..ddf377c1224ffa6f9eaac76efb0dcbac415dc795 100644 (file)
--- a/ssl/s3_srvr.c
+++ b/ssl/s3_srvr.c
@@ -138,7 +138,7 @@ SSL *s;
        BIO *under;
        int new_state,state,skip=0;
 
-       RAND_seed((unsigned char *)&Time,sizeof(Time));
+       RAND_seed(&Time,sizeof(Time));
        ERR_clear_error();
        clear_sys_error();