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

removed MT19937 which is not used anymore. Changed N from 624 to 1024 to reduce cost

Browse Source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6497 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
csoler 2013-07-11 20:59:18 +00:00
parent 207d86543c
commit 4c53d8dc5b
2 changed files with 4 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3,11 +3,8 @@
#include <unistd.h> #include <unistd.h>
#include "rsrandom.h" #include "rsrandom.h"
#define RSRANDOM_USE_SSL
#ifdef RSRANDOM_USE_SSL
#include <openssl/rand.h> #include <openssl/rand.h>
#endif
uint32_t RSRandom::index = RSRandom::N ; uint32_t RSRandom::index = RSRandom::N ;
std::vector<uint32_t> RSRandom::MT(RSRandom::N,0u) ; std::vector<uint32_t> RSRandom::MT(RSRandom::N,0u) ;
RsMutex RSRandom::rndMtx("RSRandom") ; RsMutex RSRandom::rndMtx("RSRandom") ;
@ -16,22 +13,9 @@ RsMutex RSRandom::rndMtx("RSRandom") ;
// OpenSSL random bytes: // OpenSSL random bytes:
// - on systems that only have /dev/urandom (linux, BSD, MacOS), we don't need to call the seed // - on systems that only have /dev/urandom (linux, BSD, MacOS), we don't need to call the seed
// - on windows, we need to // - on windows, we need to
// MT19937 pseudo random
// - always seed.
// //
#ifdef WINDOWS_SYS #ifdef WINDOWS_SYS
static bool auto_seed = RSRandom::seed( (time(NULL) + ((uint32_t) pthread_self().p)*0x1293fe)^0x18e34a12 ) ; 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__)
// since this is completely insecure anyway, just kludge for now
static bool auto_seed = RSRandom::seed(time(NULL));
#else
static bool auto_seed = RSRandom::seed( (time(NULL) + pthread_self()*0x1293fe + (getpid()^0x113ef76b))^0x18e34a12 ) ;
#endif
#endif
#endif #endif
bool RSRandom::seed(uint32_t s) bool RSRandom::seed(uint32_t s)
@ -45,9 +29,9 @@ bool RSRandom::seed(uint32_t s)
for (j=1; j<N; j++) for (j=1; j<N; j++)
MT[j] = (1812433253UL * (MT[j-1] ^ (MT[j-1] >> 30)) + j) & 0xffffffffUL ; 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)) ; RAND_seed((unsigned char *)&MT[0],N*sizeof(uint32_t)) ;
#endif locked_next_state() ;
return true ; return true ;
} }
@ -57,19 +41,7 @@ void RSRandom::random_bytes(unsigned char *data,uint32_t size)
} }
void RSRandom::locked_next_state() void RSRandom::locked_next_state()
{ {
#ifdef RSRANDOM_USE_SSL
RAND_bytes((unsigned char *)&MT[0],N*sizeof(uint32_t)) ; 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) ;
MT[i] = MT[(i + M) % (int)N] ^ (y >> 1) ;
if((y & 1) == 1)
MT[i] = MT[i] ^ 0x9908b0df ;
}
#endif
index = 0 ; index = 0 ;
} }

7
libretroshare/src/util/rsrandom.h
View File

@ -51,12 +51,7 @@ class RSRandom
private: private:
static RsMutex rndMtx ; static RsMutex rndMtx ;
static const uint32_t N = 624; static const uint32_t N = 1024;
static const uint32_t M = 397;
static const uint32_t MATRIX_A = 0x9908b0dfUL;
static const uint32_t UMASK = 0x80000000UL;
static const uint32_t LMASK = 0x7fffffffUL;
static void locked_next_state() ; static void locked_next_state() ;
static uint32_t index ; static uint32_t index ;