Skip to content

Move random-related defines to "crypto/rand.h" [1.1.1]#10761

Closed
mspncp wants to merge 1 commit intoopenssl:OpenSSL_1_1_1-stablefrom
mspncp:pr-move-random-defines-again-111
Closed

Move random-related defines to "crypto/rand.h" [1.1.1]#10761
mspncp wants to merge 1 commit intoopenssl:OpenSSL_1_1_1-stablefrom
mspncp:pr-move-random-defines-again-111

Conversation

@mspncp
Copy link
Contributor

@mspncp mspncp commented Jan 6, 2020

This fixes commit 7b18d1a, which moved the
DEVRANDOM and DEVRANDOM_EGD defines into rand_unix.c. That change introduced
the regression that the compiler complains about missing declarations in
crypto/info.c when OpenSSL is configured using --with-rand-seed=devrandom
(resp. --with-rand-seed=egd)

Fixes #10759

@mspncp mspncp added approval: review pending This pull request needs review by a committer branch: 1.1.1 Applies to OpenSSL_1_1_1-stable branch (EOL) labels Jan 6, 2020
This fixes commit 7b18d1a, which moved the
DEVRANDOM and DEVRANDOM_EGD defines into rand_unix.c. That change introduced
the regression that the compiler complains about missing declarations in
apps/version.c when OpenSSL is configured using `--with-rand-seed=devrandom`
(resp. `--with-rand-seed=egd`)

Fixes openssl#10759
@mspncp mspncp force-pushed the pr-move-random-defines-again-111 branch from 61edd57 to 6089fed Compare January 6, 2020 01:53
Copy link
Member

@t8m t8m left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The patch looks OK. Although another option would be to just revert the commit that introduced the regression.

@t8m t8m added approval: done This pull request has the required number of approvals and removed approval: review pending This pull request needs review by a committer labels Jan 6, 2020
@mspncp
Copy link
Contributor Author

mspncp commented Jan 6, 2020

The patch looks OK. Although another option would be to just revert the commit that introduced the regression.

I did in fact consider this option for 1.1.1, but that would have had the disadvantage that the code which originally came from e_os.h would have ended up in different files in master and 1.1.1. (code cleanup of e_os.h was suggested by @richsalz in #10049).

@mspncp
Copy link
Contributor Author

mspncp commented Jan 6, 2020

Ok, Tim approved #10764 in record time. I feel consent about reverting instead of fixing on 1.1.1.

@mspncp mspncp closed this Jan 6, 2020
@mspncp mspncp deleted the pr-move-random-defines-again-111 branch February 14, 2020 20:58
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

approval: done This pull request has the required number of approvals branch: 1.1.1 Applies to OpenSSL_1_1_1-stable branch (EOL)

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants