Peter Korsgaard
GitHub
1 month ago
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 4 additions and 10 deletions
Unified View
Diff Options
-
+4 -10random_seed.c
+ 4
- 10
random_seed.c
View File
| @@ -24,12 +24,6 @@ | |||||
| #define HAVE_DEV_RANDOM 1 | #define HAVE_DEV_RANDOM 1 | ||||
| #endif | #endif | ||||
| #ifdef HAVE_ARC4RANDOM | |||||
| #undef HAVE_GETRANDOM | |||||
| #undef HAVE_DEV_RANDOM | |||||
| #undef HAVE_CRYPTGENRANDOM | |||||
| #endif | |||||
| #if defined ENABLE_RDRAND | #if defined ENABLE_RDRAND | ||||
| /* cpuid */ | /* cpuid */ | ||||
| @@ -327,10 +321,6 @@ int json_c_get_random_seed(void) | |||||
| if (has_rdrand()) | if (has_rdrand()) | ||||
| return get_rdrand_seed(); | return get_rdrand_seed(); | ||||
| #endif | #endif | ||||
| #ifdef HAVE_ARC4RANDOM | |||||
| /* arc4random never fails, so use it if it's available */ | |||||
| return arc4random(); | |||||
| #else | |||||
| #ifdef HAVE_GETRANDOM | #ifdef HAVE_GETRANDOM | ||||
| { | { | ||||
| int seed = 0; | int seed = 0; | ||||
| @@ -352,6 +342,10 @@ int json_c_get_random_seed(void) | |||||
| return seed; | return seed; | ||||
| } | } | ||||
| #endif | #endif | ||||
| #ifdef HAVE_ARC4RANDOM | |||||
| /* arc4random never fails, so use it if it's available */ | |||||
| return arc4random(); | |||||
| #else | |||||
| return get_time_seed(); | return get_time_seed(); | ||||
| #endif /* !HAVE_ARC4RANDOM */ | #endif /* !HAVE_ARC4RANDOM */ | ||||
| } | } | ||||