Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix the OSSL_TIME fallback in include/internal/e_os.h #19214

Closed
wants to merge 1 commit into from

Conversation

levitte
Copy link
Member

@levitte levitte commented Sep 14, 2022

There's a fallback ossl_sleep() that uses OSSL_TIME. However,
nothing was done to ensure that OSSL_TIME is defined.

Adding an inclusion of "internal/time.h" should be enough.

There's a fallback `ossl_sleep()` that uses `OSSL_TIME`.  However,
nothing was done to ensure that `OSSL_TIME` is defined.

Adding an inclusion of "internal/time.h" should be enough.
@levitte levitte added approval: otc review pending approval: review pending This pull request needs review by a committer branch: master Merge to master branch severity: urgent Fixes an urgent issue (exempt from 24h grace period) labels Sep 14, 2022
@levitte levitte self-assigned this Sep 14, 2022
@levitte levitte requested review from a team September 14, 2022 10:35
@levitte
Copy link
Member Author

levitte commented Sep 14, 2022

Marked urgent, because of current compilation failure on VMS

Ref: https://ci.buildbot.openssl.org/#/builders/2/builds/70/steps/7/logs/stdio

@github-actions github-actions bot added the severity: fips change The pull request changes FIPS provider sources label Sep 14, 2022
Copy link
Member

@beldmit beldmit left a comment

Choose a reason for hiding this comment

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

LGTM, agreed urgent

@mattcaswell
Copy link
Member

Agree urgent.

@mattcaswell mattcaswell added approval: ready to merge The 24 hour grace period has passed, ready to merge and removed approval: review pending This pull request needs review by a committer labels Sep 14, 2022
@levitte
Copy link
Member Author

levitte commented Sep 14, 2022

Merged

eb51673 Fix the OSSL_TIME fallback in include/internal/e_os.h

openssl-machine pushed a commit that referenced this pull request Sep 14, 2022
There's a fallback `ossl_sleep()` that uses `OSSL_TIME`.  However,
nothing was done to ensure that `OSSL_TIME` is defined.

Adding an inclusion of "internal/time.h" should be enough.

Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Dmitry Belyavskiy <beldmit@gmail.com>
(Merged from #19214)
@levitte levitte closed this Sep 14, 2022
@levitte levitte deleted the fix-ossl_time-fallback branch September 14, 2022 11:02
sftcd pushed a commit to sftcd/openssl that referenced this pull request Sep 24, 2022
There's a fallback `ossl_sleep()` that uses `OSSL_TIME`.  However,
nothing was done to ensure that `OSSL_TIME` is defined.

Adding an inclusion of "internal/time.h" should be enough.

Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Dmitry Belyavskiy <beldmit@gmail.com>
(Merged from openssl#19214)
beldmit pushed a commit to beldmit/openssl that referenced this pull request Dec 26, 2022
There's a fallback `ossl_sleep()` that uses `OSSL_TIME`.  However,
nothing was done to ensure that `OSSL_TIME` is defined.

Adding an inclusion of "internal/time.h" should be enough.

Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Dmitry Belyavskiy <beldmit@gmail.com>
(Merged from openssl#19214)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approval: ready to merge The 24 hour grace period has passed, ready to merge branch: master Merge to master branch severity: fips change The pull request changes FIPS provider sources severity: urgent Fixes an urgent issue (exempt from 24h grace period)
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants