Patches from Vern Staats <staatsvr@asc.hpc.mil> to get Kerberos 5 in

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

diff --git a/crypto/rand/md_rand.c b/crypto/rand/md_rand.c
index c8728a07bf6827e9f8eb6f7ffe89c6c1bff7cb9f..1c87f2117110e29335a7123af06d20b181730f36 100644 (file)
--- a/crypto/rand/md_rand.c
+++ b/crypto/rand/md_rand.c
@@ -264,7 +264,7 @@ static void ssleay_rand_add(const void *buf, int num, double add)
                        
                MD_Update(&m,buf,j);
                MD_Update(&m,(unsigned char *)&(md_c[0]),sizeof(md_c));
-               MD_Final(local_md,&m);
+               MD_Final(&m,local_md);
                md_c[1]++;
 
                buf=(const char *)buf + j;
@@ -457,7 +457,7 @@ static int ssleay_rand_bytes(unsigned char *buf, int num)
                        }
                else
                        MD_Update(&m,&(state[st_idx]),j);
-               MD_Final(local_md,&m);
+               MD_Final(&m,local_md);
 
                for (i=0; i<j; i++)
                        {
@@ -473,7 +473,7 @@ static int ssleay_rand_bytes(unsigned char *buf, int num)
        MD_Update(&m,local_md,MD_DIGEST_LENGTH);
        CRYPTO_w_lock(CRYPTO_LOCK_RAND);
        MD_Update(&m,md,MD_DIGEST_LENGTH);
-       MD_Final(md,&m);
+       MD_Final(&m,md);
        CRYPTO_w_unlock(CRYPTO_LOCK_RAND);
 
        memset(&m,0,sizeof(m));
@@ -493,11 +493,12 @@ static int ssleay_rand_bytes(unsigned char *buf, int num)
 static int ssleay_rand_pseudo_bytes(unsigned char *buf, int num) 
        {
        int ret;
+       unsigned long err;
 
        ret = RAND_bytes(buf, num);
        if (ret == 0)
                {
-               long err = ERR_peek_error();
+               err = ERR_peek_error();
                if (ERR_GET_LIB(err) == ERR_LIB_RAND &&
                    ERR_GET_REASON(err) == RAND_R_PRNG_NOT_SEEDED)
                        (void)ERR_get_error();