d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make read_random() take a (void *) argument instead of (char *)

Browse Source
This commit is contained in:
phk 1998-04-06 09:30:42 +00:00
parent 3c122bd961
commit ab5541db4c
6 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sys/i386/include/random.h
View File

@ -1,7 +1,7 @@
/*
* random.h -- A strong random number generator
*
* $Id: random.h,v 1.12 1997/06/07 00:57:26 bde Exp $
* $Id: random.h,v 1.13 1997/09/14 03:19:03 peter Exp $
*
* Version 0.95, last modified 18-Oct-95
*
@ -75,8 +75,8 @@ void add_blkdev_randomness(int major);
#ifdef notused
void get_random_bytes(void *buf, u_int nbytes);
#endif
u_int read_random(char *buf, u_int size);
u_int read_random_unlimited(char *buf, u_int size);
u_int read_random(void *buf, u_int size);
u_int read_random_unlimited(void *buf, u_int size);
#ifdef notused
u_int write_random(const char *buf, u_int nbytes);
#endif

10
sys/i386/isa/random_machdep.c
View File

@ -1,7 +1,7 @@
/*
* random_machdep.c -- A strong random number generator
*
* $Id: random_machdep.c,v 1.22 1998/03/28 13:24:35 bde Exp $
* $Id: random_machdep.c,v 1.23 1998/03/29 11:55:06 phk Exp $
*
* Version 0.95, last modified 18-Oct-95
*
@ -321,18 +321,18 @@ get_random_bytes(void *buf, u_int nbytes)
#endif /* notused */
u_int
read_random(char *buf, u_int nbytes)
read_random(void *buf, u_int nbytes)
{
if ((nbytes * 8) > random_state.entropy_count)
nbytes = random_state.entropy_count / 8;
return extract_entropy(&random_state, buf, nbytes);
return extract_entropy(&random_state, (char *)buf, nbytes);
}
u_int
read_random_unlimited(char *buf, u_int nbytes)
read_random_unlimited(void *buf, u_int nbytes)
{
return extract_entropy(&random_state, buf, nbytes);
return extract_entropy(&random_state, (char *)buf, nbytes);
}
#ifdef notused

10
sys/kern/kern_random.c
View File

@ -1,7 +1,7 @@
/*
* random_machdep.c -- A strong random number generator
*
* $Id: random_machdep.c,v 1.22 1998/03/28 13:24:35 bde Exp $
* $Id: random_machdep.c,v 1.23 1998/03/29 11:55:06 phk Exp $
*
* Version 0.95, last modified 18-Oct-95
*
@ -321,18 +321,18 @@ get_random_bytes(void *buf, u_int nbytes)
#endif /* notused */
u_int
read_random(char *buf, u_int nbytes)
read_random(void *buf, u_int nbytes)
{
if ((nbytes * 8) > random_state.entropy_count)
nbytes = random_state.entropy_count / 8;
return extract_entropy(&random_state, buf, nbytes);
return extract_entropy(&random_state, (char *)buf, nbytes);
}
u_int
read_random_unlimited(char *buf, u_int nbytes)
read_random_unlimited(void *buf, u_int nbytes)
{
return extract_entropy(&random_state, buf, nbytes);
return extract_entropy(&random_state, (char *)buf, nbytes);
}
#ifdef notused

8
sys/net/if_spppsubr.c
View File

@ -17,7 +17,7 @@
*
* From: Version 2.4, Thu Apr 30 17:17:21 MSD 1997
*
* $Id: if_spppsubr.c,v 1.35 1998/03/30 09:52:06 phk Exp $
* $Id: if_spppsubr.c,v 1.36 1998/04/04 13:26:03 phk Exp $
*/
#include "opt_inet.h"
@ -990,7 +990,7 @@ sppp_cisco_input(struct sppp *sp, struct mbuf *m)
++sp->pp_loopcnt;
/* Generate new local sequence number */
read_random((char*)&sp->pp_seq, sizeof sp->pp_seq);
read_random(&sp->pp_seq, sizeof sp->pp_seq);
break;
}
sp->pp_loopcnt = 0;
@ -2117,7 +2117,7 @@ sppp_lcp_RCN_nak(struct sppp *sp, struct lcp_header *h, int len)
if (magic == ~sp->lcp.magic) {
if (debug)
addlog("magic glitch ");
read_random((char*)&sp->lcp.magic, sizeof sp->lcp.magic);
read_random(&sp->lcp.magic, sizeof sp->lcp.magic);
} else {
sp->lcp.magic = magic;
if (debug)
@ -2277,7 +2277,7 @@ sppp_lcp_scr(struct sppp *sp)
if (sp->lcp.opts & (1 << LCP_OPT_MAGIC)) {
if (! sp->lcp.magic)
read_random((char*)&sp->lcp.magic, sizeof sp->lcp.magic);
read_random(&sp->lcp.magic, sizeof sp->lcp.magic);
opt[i++] = LCP_OPT_MAGIC;
opt[i++] = 6;
opt[i++] = sp->lcp.magic >> 24;

4
sys/netipx/ipx_input.c
View File

@ -33,7 +33,7 @@
*
* @(#)ipx_input.c
*
* $Id: ipx_input.c,v 1.15 1998/02/09 06:10:19 eivind Exp $
* $Id: ipx_input.c,v 1.16 1998/03/30 09:53:09 phk Exp $
*/
#include <sys/param.h>
@ -107,7 +107,7 @@ ipx_init()
ipx_broadnet = *(union ipx_net *)allones;
ipx_broadhost = *(union ipx_host *)allones;
read_random((char *)&ipx_pexseq, sizeof ipx_pexseq);
read_random(&ipx_pexseq, sizeof ipx_pexseq);
ipxintrq.ifq_maxlen = ipxqmaxlen;
ipxpcb.ipxp_next = ipxpcb.ipxp_prev = &ipxpcb;
ipxrawpcb.ipxp_next = ipxrawpcb.ipxp_prev = &ipxrawpcb;

6
sys/sys/random.h
View File

@ -1,7 +1,7 @@
/*
* random.h -- A strong random number generator
*
* $Id: random.h,v 1.12 1997/06/07 00:57:26 bde Exp $
* $Id: random.h,v 1.13 1997/09/14 03:19:03 peter Exp $
*
* Version 0.95, last modified 18-Oct-95
*
@ -75,8 +75,8 @@ void add_blkdev_randomness(int major);
#ifdef notused
void get_random_bytes(void *buf, u_int nbytes);
#endif
u_int read_random(char *buf, u_int size);
u_int read_random_unlimited(char *buf, u_int size);
u_int read_random(void *buf, u_int size);
u_int read_random_unlimited(void *buf, u_int size);
#ifdef notused
u_int write_random(const char *buf, u_int nbytes);
#endif