kenmirrors
/
freeswitch
mirror of https://github.com/signalwire/freeswitch.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Wed Feb 25 11:29:23 CST 2009 Pekka Pessi <first.last@nokia.com> 

* su_uniqueid.c: fixed seed array usage
  Ignore-this: b6e6a195f3f34abc2119a741f8b6f5e2

  Paper bags, anyone?



git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@12281 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
Michael Jerris 2009-02-25 19:34:54 +00:00
parent 5974867444
commit cf9f7888f1
2 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libs/sofia-sip/.update
View File

@ -1 +1 @@
Wed Feb 25 13:30:44 CST 2009 Wed Feb 25 13:31:50 CST 2009

21
libs/sofia-sip/libsofia-sip-ua/su/su_uniqueid.c
View File

@ -136,11 +136,14 @@ static void init(void)
{ {
int i; int i;
#define N_SEED 32
#if HAVE_INITSTATE #if HAVE_INITSTATE
/* Allow libsofia-sip-ua.so to unload. */ /* Allow libsofia-sip-ua.so to unload. */
uint32_t *seed = calloc(32, sizeof(uint32_t)); uint32_t *seed = calloc(N_SEED, sizeof *seed);
#else #else
static uint32_t seed[32] = { 0 }; static uint32_t _seed[N_SEED] = { 0 };
uint32_t *seed = _seed;
#endif #endif
su_time_t now; su_time_t now;
@ -153,25 +156,25 @@ static void init(void)
#endif /* HAVE_DEV_URANDOM */ #endif /* HAVE_DEV_URANDOM */
if (urandom) { if (urandom) {
size_t len = fread(seed, sizeof seed, 1, urandom); (void)len; size_t len = fread(seed, sizeof *seed, N_SEED, urandom); (void)len;
} }
else { else {
for (i = 0; i < 16; i++) { for (i = 0; i < N_SEED; i += 2) {
#if HAVE_CLOCK_GETTIME #if HAVE_CLOCK_GETTIME
struct timespec ts; struct timespec ts;
(void)clock_gettime(CLOCK_REALTIME, &ts); (void)clock_gettime(CLOCK_REALTIME, &ts);
seed[2*i] ^= ts.tv_sec; seed[2*i+1] ^= ts.tv_nsec; seed[i] ^= ts.tv_sec; seed[i + 1] ^= ts.tv_nsec;
#endif #endif
su_time(&now); su_time(&now);
seed[2*i] ^= now.tv_sec; seed[2*i+1] ^= now.tv_sec; seed[i] ^= now.tv_sec; seed[i + 1] ^= now.tv_sec;
} }
seed[30] ^= getuid(); seed[0] ^= getuid();
seed[31] ^= getpid(); seed[1] ^= getpid();
} }
#if HAVE_INITSTATE #if HAVE_INITSTATE
initstate(seed[0] ^ seed[1], (char *)seed, 32 * sizeof(uint32_t)); initstate(seed[0] ^ seed[1], (void *)seed, N_SEED * (sizeof *seed));
#else #else
srand(seed[0] ^ seed[1]); srand(seed[0] ^ seed[1]);
#endif #endif