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

ERR: preserve system error number in a few more places #7902

Closed
wants to merge 1 commit into from

Conversation

levitte
Copy link
Member

@levitte levitte commented Dec 14, 2018

It turns out that initialization may change the error number, so we
need to preserve the system error number in functions where
initialization is called for.
These are ERR_get_state() and err_shelve_state()

Fixes #7897

It turns out that intialization may change the error number, so we
need to preserve the system error number in functions where
initialization is called for.
These are ERR_get_state() and err_shelve_state()

Fixes openssl#7897
@levitte levitte added branch: master Merge to master branch branch: 1.1.1 Merge to OpenSSL_1_1_1-stable branch labels Dec 14, 2018
@levitte
Copy link
Member Author

levitte commented Dec 14, 2018

@mshaw1990, if you would test the changes here, that would be great. They should be cherry-pickable to the 1.1.1 branch, if you prefer that.

@levitte levitte changed the title ERR: preserve system error number in a few more places WIP: ERR: preserve system error number in a few more places Dec 14, 2018
@levitte
Copy link
Member Author

levitte commented Dec 14, 2018

I'm marking this WorkInProgress until having received confirmation from @mshaw1990 that this solves #7897

@mshaw1990
Copy link

I downloaded commit ee80f4b and the test now passes!

@levitte levitte changed the title WIP: ERR: preserve system error number in a few more places ERR: preserve system error number in a few more places Dec 14, 2018
@levitte
Copy link
Member Author

levitte commented Dec 14, 2018

Cool. Thanks for trying it out!

@levitte levitte added the approval: done This pull request has the required number of approvals label Dec 14, 2018
levitte added a commit that referenced this pull request Dec 14, 2018
It turns out that intialization may change the error number, so we
need to preserve the system error number in functions where
initialization is called for.
These are ERR_get_state() and err_shelve_state()

Fixes #7897

Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from #7902)

(cherry picked from commit 91c5473)
@levitte
Copy link
Member Author

levitte commented Dec 14, 2018

Merged.

master:
91c5473 ERR: preserve system error number in a few more places

1.1.1:
1454194 ERR: preserve system error number in a few more places

@levitte levitte closed this Dec 14, 2018
levitte added a commit that referenced this pull request Dec 14, 2018
It turns out that intialization may change the error number, so we
need to preserve the system error number in functions where
initialization is called for.
These are ERR_get_state() and err_shelve_state()

Fixes #7897

Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from #7902)
@mspncp mspncp added this to the 1.1.1b milestone Dec 23, 2018
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: master Merge to master branch branch: 1.1.1 Merge to OpenSSL_1_1_1-stable branch
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants