current configure.in, 1.208, 1.209 jcc.c, 1.451, 1.452 miscutil.c, 1.82, 1.83
Fabian Keil <[email protected]> Thu, 04 May 2017 14:34:20 +0000
| Newsgroups | gmane.comp.web.privoxy.cvs |
|---|---|
| Message-ID | <[email protected]> |
Update of /cvsroot/ijbswa/current
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv5306
Modified Files:
configure.in jcc.c miscutil.c
Log Message:
Use arc4random() if it's available
While Privoxy doesn't need high quality pseudo-random numbers
there's no reason not to use them when we can and this silences
a warning emitted by code checkers that can't tell whether or not
the quality matters.
Index: jcc.c
===================================================================
RCS file: /cvsroot/ijbswa/current/jcc.c,v
retrieving revision 1.451
retrieving revision 1.452
diff -C2 -d -r1.451 -r1.452
*** jcc.c 8 Mar 2017 13:15:49 -0000 1.451
--- jcc.c 4 May 2017 14:34:18 -0000 1.452
***************
*** 211,217 ****
#endif /* ndef HAVE_GMTIME_R */
! #ifndef HAVE_RANDOM
privoxy_mutex_t rand_mutex;
! #endif /* ndef HAVE_RANDOM */
#endif /* def MUTEX_LOCKS_AVAILABLE */
--- 211,217 ----
#endif /* ndef HAVE_GMTIME_R */
! #if !defined(HAVE_ARC4RANDOM) && !defined(HAVE_RANDOM)
privoxy_mutex_t rand_mutex;
! #endif /* !defined(HAVE_ARC4RANDOM) && !defined(HAVE_RANDOM) */
#endif /* def MUTEX_LOCKS_AVAILABLE */
***************
*** 3492,3498 ****
#endif /* ndef HAVE_GMTIME_R */
! #ifndef HAVE_RANDOM
privoxy_mutex_init(&rand_mutex);
! #endif /* ndef HAVE_RANDOM */
#endif /* def MUTEX_LOCKS_AVAILABLE */
--- 3492,3498 ----
#endif /* ndef HAVE_GMTIME_R */
! #if !defined(HAVE_ARC4RANDOM) && !defined(HAVE_RANDOM)
privoxy_mutex_init(&rand_mutex);
! #endif /* !defined(HAVE_ARC4RANDOM) && !defined(HAVE_RANDOM) */
#endif /* def MUTEX_LOCKS_AVAILABLE */
***************
*** 3530,3534 ****
--- 3530,3536 ----
int argc_pos = 0;
int do_config_test = 0;
+ #ifndef HAVE_ARC4RANDOM
unsigned int random_seed;
+ #endif
#ifdef unix
struct passwd *pw = NULL;
***************
*** 3738,3741 ****
--- 3740,3744 ----
#endif
+ #ifndef HAVE_ARC4RANDOM
random_seed = (unsigned int)time(NULL);
#ifdef HAVE_RANDOM
***************
*** 3744,3747 ****
--- 3747,3751 ----
srand(random_seed);
#endif /* ifdef HAVE_RANDOM */
+ #endif /* ifndef HAVE_ARC4RANDOM */
/*
Index: configure.in
===================================================================
RCS file: /cvsroot/ijbswa/current/configure.in,v
retrieving revision 1.208
retrieving revision 1.209
diff -C2 -d -r1.208 -r1.209
*** configure.in 8 Mar 2017 13:13:18 -0000 1.208
--- configure.in 4 May 2017 14:34:18 -0000 1.209
***************
*** 775,778 ****
--- 775,779 ----
AC_CHECK_FUNCS([ \
access \
+ arc4random \
atexit \
getcwd \
Index: miscutil.c
===================================================================
RCS file: /cvsroot/ijbswa/current/miscutil.c,v
retrieving revision 1.82
retrieving revision 1.83
diff -C2 -d -r1.82 -r1.83
*** miscutil.c 23 Jul 2016 23:05:15 -0000 1.82
--- miscutil.c 4 May 2017 14:34:18 -0000 1.83
***************
*** 766,770 ****
if (range <= 0) return 0;
! #ifdef HAVE_RANDOM
number = random() % range + 1;
#elif defined(MUTEX_LOCKS_AVAILABLE)
--- 766,772 ----
if (range <= 0) return 0;
! #ifdef HAVE_ARC4RANDOM
! number = arc4random() % range + 1;
! #elif defined(HAVE_RANDOM)
number = random() % range + 1;
#elif defined(MUTEX_LOCKS_AVAILABLE)
***************
*** 790,794 ****
number = rand() % (long int)(range + 1);
! #endif /* (def HAVE_RANDOM) */
return number;
--- 792,796 ----
number = rand() % (long int)(range + 1);
! #endif /* (def HAVE_ARC4RANDOM) */
return number;
------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot