Fix data race in RAND_DRBG_generate [1.1.1]#7502
Closed
bernd-edlinger wants to merge 2 commits intoopenssl:OpenSSL_1_1_1-stablefrom
Closed
Fix data race in RAND_DRBG_generate [1.1.1]#7502bernd-edlinger wants to merge 2 commits intoopenssl:OpenSSL_1_1_1-stablefrom
bernd-edlinger wants to merge 2 commits intoopenssl:OpenSSL_1_1_1-stablefrom
Conversation
Back-port of a83dc59 to 1.1.1-stable. Fixes openssl#7394
bernd-edlinger
added
the
branch: 1.1.1
Contributor
|
The builds fail. try to revert the renamings, i.e:
then it should compile. |
Member
Author
|
Aargh... |
Contributor
|
I'll backport the renamings. As far as they don't touch any public interfaces, that should be ok and prevent unecessary conflicts in the future. |
bernd-edlinger
commented
Oct 26, 2018
| * rand_drbg_seedlen(master) bytes. | ||
| * | ||
| * If an os entropy source is available then RAND_seed(buffer, bufsize) | ||
| * is expected to succeed always. |
Member
Author
There was a problem hiding this comment.
kdiff3 accidentally picked this comment up, will revert.
Member
Author
|
Yes, also the comment changes are mostly good. |
Contributor
|
You could try the following:
|
Member
Author
|
Are you working on a PR with the trivial changes from master? |
Contributor
|
I can do it sometimes later this evening. |
Contributor
|
If you have enough time to wait for it, I'll fix 1.1.1 such that both your commit a83dc59 and my pr can be cherry-picked cleanly afterwards. Then this pr will be superfluous. |
mspncp
changed the title
Member
Author
|
Yes, thanks! |
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
Back-port of a83dc59 to 1.1.1-stable.
Fixes #7394