Add time to the RAND pool before each RAND_bytes call #1857
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| #define PHP_OPENSSL_RAND_ADD_TIME() php_openssl_rand_add_timeval() | ||
| #endif | ||
|
|
||
| static inline void php_openssl_rand_add_timeval() /* {{{ */ |
There was a problem hiding this comment.
Since this is not used on Windows, it might as well be apart of the #else part ^
|
Merged via 0e2447c |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This is an another variant of the fix for bug 1844. The idea is to sort of back-port what OpenSSL 1.1 does and add a time to the entropy pool before each RAND_bytes call. It means also before each OpenSSL function that calls it internally. It is replaced by noop on Windows where it's not needed and it will be also noop if compiled with OpenSSL 1.1 (once I merge it's support to master).