enoch/n2n
1
0
Fork 0
mirror of https://github.com/ntop/n2n.git synced 2024-09-19 16:41:11 +02:00
Code Issues Actions Packages Projects Releases 1 Wiki Activity

separated counter variables (#1078)

Browse Source
This commit is contained in:
Logan oos Even 2023-02-25 18:03:14 +01:00 committed by GitHub
parent 2ee7dfdb98
commit 709590d66e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/random_numbers.c
View File

@ -99,10 +99,25 @@ uint64_t n2n_seed (void) {
uint64_t seed = 0; /* this could even go uninitialized */ uint64_t seed = 0; /* this could even go uninitialized */
uint64_t ret = 0; /* this could even go uninitialized */ uint64_t ret = 0; /* this could even go uninitialized */
// each block goes with separate counter variables i, j, k because
// we do not know which one (or more) of them actually will be compiled
#ifdef SYS_getrandom #ifdef SYS_getrandom
size_t i = 0; size_t i = 0;
int rc = -1; int rc = -1;
#endif
#ifdef __RDRND__
size_t j = 0;
#endif
#ifdef __RDSEED__
#if __GNUC__ > 4
size_t k = 0;
#endif
#endif
#ifdef SYS_getrandom
for(i = 0; (i < RND_RETRIES) && (rc != sizeof(seed)); i++) { for(i = 0; (i < RND_RETRIES) && (rc != sizeof(seed)); i++) {
rc = syscall (SYS_getrandom, &seed, sizeof(seed), GRND_NONBLOCK); rc = syscall (SYS_getrandom, &seed, sizeof(seed), GRND_NONBLOCK);
// if successful, rc should contain the requested number of random bytes // if successful, rc should contain the requested number of random bytes
@ -126,7 +141,7 @@ uint64_t n2n_seed (void) {
// __RDRND__ is set only if architecturual feature is set, e.g. compiled with -march=native // __RDRND__ is set only if architecturual feature is set, e.g. compiled with -march=native
#ifdef __RDRND__ #ifdef __RDRND__
for(i = 0; i < RND_RETRIES; i++) { for(j = 0; j < RND_RETRIES; j++) {
if(_rdrand64_step((unsigned long long*)&seed)) { if(_rdrand64_step((unsigned long long*)&seed)) {
// success! // success!
// from now on, we keep this inside the loop because in case of failure // from now on, we keep this inside the loop because in case of failure
@ -136,7 +151,7 @@ uint64_t n2n_seed (void) {
} }
// continue loop to try again otherwise // continue loop to try again otherwise
} }
if(i == RND_RETRIES) { if(j == RND_RETRIES) {
traceEvent(TRACE_ERROR, "n2n_seed was not able to get a hardware generated random number from RDRND."); traceEvent(TRACE_ERROR, "n2n_seed was not able to get a hardware generated random number from RDRND.");
} }
#endif #endif
@ -144,7 +159,7 @@ uint64_t n2n_seed (void) {
// __RDSEED__ ist set only if architecturual feature is set, e.g. compile with -march=native // __RDSEED__ ist set only if architecturual feature is set, e.g. compile with -march=native
#ifdef __RDSEED__ #ifdef __RDSEED__
#if __GNUC__ > 4 #if __GNUC__ > 4
for(i = 0; i < RND_RETRIES; i++) { for(k = 0; k < RND_RETRIES; k++) {
if(_rdseed64_step((unsigned long long*)&seed)) { if(_rdseed64_step((unsigned long long*)&seed)) {
// success! // success!
ret += seed; ret += seed;
@ -152,7 +167,7 @@ uint64_t n2n_seed (void) {
} }
// continue loop to try again otherwise // continue loop to try again otherwise
} }
if(i == RND_RETRIES) { if(k == RND_RETRIES) {
traceEvent(TRACE_ERROR, "n2n_seed was not able to get a hardware generated random number from RDSEED."); traceEvent(TRACE_ERROR, "n2n_seed was not able to get a hardware generated random number from RDSEED.");
} }
#endif #endif