Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-10-01 02:35:48 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

- Changed default random number generator to use RAND_bytes from openssl.

Browse Source 
- Updated random testing code and fixed compilation



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4621 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
csoler 2011-09-28 19:34:27 +00:00
parent febcfc9bd3
commit 5ae506c317
3 changed files with 35 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
libretroshare/src/tests/general/Makefile
View File

@ -1,5 +1,6 @@
RS_TOP_DIR = ../..
DHT_TOP_DIR = ../../../../libbitdht/src
##### Define any flags that are needed for this section #######
###############################################################

8
libretroshare/src/tests/general/random_test.cc
View File

@ -2,6 +2,7 @@
#include <fenv.h>
#endif
#include <iostream>
#include <iomanip>
#include <vector>
#include <stdlib.h>
#include <math.h>
@ -87,7 +88,7 @@ class myThread: public RsThread
{
// test that random numbers are regularly disposed
//
int N = 500 ;
int N = 5000 ;
int B = 8 ;
std::vector<int> buckets(B,0) ;
@ -133,6 +134,11 @@ int main(int argc, char **argv)
feenableexcept(FE_DIVBYZERO) ;
#endif
std::cerr << "Generating random 64 chars string (run that again to test that it's changing): " << RSRandom::random_alphaNumericString(64) << std::endl;
std::cerr << "Generating 10 random uint64_t:" << std::endl;
for(int i=0;i<10;++i)
std::cerr << std::hex << RSRandom::random_u64() << std::endl;
int nt = 10 ; // number of threads.
std::vector<myThread *> threads(nt,(myThread*)NULL) ;

30
libretroshare/src/util/rsrandom.cc
View File

@ -3,13 +3,26 @@
#include <unistd.h>
#include "rsrandom.h"
uint32_t RSRandom::index = 0 ;
#define RSRANDOM_USE_SSL
#ifdef RSRANDOM_USE_SSL
#include <openssl/rand.h>
#endif
uint32_t RSRandom::index = RSRandom::N ;
std::vector<uint32_t> RSRandom::MT(RSRandom::N,0u) ;
RsMutex RSRandom::rndMtx("RSRandom") ;
// Random seed is called according to the following rules:
// OpenSSL random bytes:
// - on systems that only have /dev/urandom (linux, BSD, MacOS), we don't need to call the seed
// - on windows, we need to
// MT19937 pseudo random
// - always seed.
//
#ifdef WINDOWS_SYS
static bool auto_seed = RSRandom::seed( (time(NULL) + ((uint32_t) pthread_self().p)*0x1293fe)^0x18e34a12 ) ;
#else
#ifndef RSRANDOM_USE_SSL
#ifdef __APPLE__
static bool auto_seed = RSRandom::seed( (time(NULL) + pthread_mach_thread_np(pthread_self())*0x1293fe + (getpid()^0x113ef76b))^0x18e34a12 ) ;
#elif defined(__FreeBSD__)
@ -19,6 +32,8 @@ static bool auto_seed = RSRandom::seed( (time(NULL) + ((uint32_t) pthread_self()
static bool auto_seed = RSRandom::seed( (time(NULL) + pthread_self()*0x1293fe + (getpid()^0x113ef76b))^0x18e34a12 ) ;
#endif
#endif
#endif
bool RSRandom::seed(uint32_t s)
{
RsStackMutex mtx(rndMtx) ;
@ -30,11 +45,17 @@ bool RSRandom::seed(uint32_t s)
for (j=1; j<N; j++)
MT[j] = (1812433253UL * (MT[j-1] ^ (MT[j-1] >> 30)) + j) & 0xffffffffUL ;
#ifdef RSRANDOM_USE_SSL
RAND_seed((unsigned char *)&MT[0],N*sizeof(uint32_t)) ;
#endif
return true ;
}
void RSRandom::locked_next_state()
{
#ifdef RSRANDOM_USE_SSL
RAND_bytes((unsigned char *)&MT[0],N*sizeof(uint32_t)) ;
#else
for(uint32_t i=0;i<N;++i)
{
uint32_t y = ((MT[i]) & UMASK) | ((MT[(i+1)%(int)N]) & LMASK) ;
@ -44,6 +65,7 @@ void RSRandom::locked_next_state()
if((y & 1) == 1)
MT[i] = MT[i] ^ 0x9908b0df ;
}
#endif
index = 0 ;
}
@ -54,10 +76,12 @@ uint32_t RSRandom::random_u32()
{
RsStackMutex mtx(rndMtx) ;
y = MT[index++] ;
index++ ;
if(index == N)
if(index >= N)
locked_next_state();
y = MT[index] ;
}
// Tempering