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

Use arc4random_buf(). While there, unifdef the code for HAVE_ARC4RANDOM.

Browse Source 
MFC after:	2 weeks
This commit is contained in:
Xin LI 2015-08-16 23:23:58 +00:00
parent 7c669ab6cc
commit 1ae1bd497f
2 changed files with 2 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
sbin/ping6/Makefile
View File

@ -3,8 +3,7 @@
PROG= ping6 PROG= ping6
MAN= ping6.8 MAN= ping6.8
CFLAGS+=-DIPSEC -DKAME_SCOPEID -DUSE_RFC2292BIS \ CFLAGS+=-DIPSEC -DKAME_SCOPEID -DUSE_RFC2292BIS
-DHAVE_ARC4RANDOM
WARNS?= 3 WARNS?= 3
BINOWN= root BINOWN= root

15
sbin/ping6/ping6.c
View File

@ -288,9 +288,6 @@ main(int argc, char *argv[])
{ {
struct timeval last, intvl; struct timeval last, intvl;
struct sockaddr_in6 from, *sin6; struct sockaddr_in6 from, *sin6;
#ifndef HAVE_ARC4RANDOM
struct timeval seed;
#endif
struct addrinfo hints, *res; struct addrinfo hints, *res;
struct sigaction si_sa; struct sigaction si_sa;
int cc, i; int cc, i;
@ -751,17 +748,7 @@ main(int argc, char *argv[])
*datap++ = i; *datap++ = i;
ident = getpid() & 0xFFFF; ident = getpid() & 0xFFFF;
#ifndef HAVE_ARC4RANDOM arc4random_buf(nonce, sizeof(nonce));
gettimeofday(&seed, NULL);
srand((unsigned int)(seed.tv_sec ^ seed.tv_usec ^ (long)ident));
memset(nonce, 0, sizeof(nonce));
for (i = 0; i < sizeof(nonce); i += sizeof(int))
*((int *)&nonce[i]) = rand();
#else
memset(nonce, 0, sizeof(nonce));
for (i = 0; i < (int)sizeof(nonce); i += sizeof(u_int32_t))
*((u_int32_t *)&nonce[i]) = arc4random();
#endif
optval = 1; optval = 1;
if (options & F_DONTFRAG) if (options & F_DONTFRAG)
if (setsockopt(s, IPPROTO_IPV6, IPV6_DONTFRAG, if (setsockopt(s, IPPROTO_IPV6, IPV6_DONTFRAG,