Skip to content

Comments

Modify ssl_handshake_hash to call SSLfatal#15520

Closed
trevorlarock wants to merge 1 commit intoopenssl:masterfrom
trevorlarock:master
Closed

Modify ssl_handshake_hash to call SSLfatal#15520
trevorlarock wants to merge 1 commit intoopenssl:masterfrom
trevorlarock:master

Conversation

@trevorlarock
Copy link

When EVP_MD_CTX_new fails call SSLfatal before the goto err.
This resolves a state machine issue on the out of memory condition.

Fixes #15491.

@openssl-machine openssl-machine added the hold: cla required The contributor needs to submit a license agreement label May 28, 2021
When EVP_MD_CTX_new fails call SSLfatal before the goto err.
This resolves a state machine issue on the out of memory condition.

Fixes #15491.
CLA: trivial
@openssl-machine openssl-machine removed the hold: cla required The contributor needs to submit a license agreement label May 28, 2021
@kaduk kaduk added approval: otc review pending branch: master Applies to master branch cla: trivial One of the commits is marked as 'CLA: trivial' triaged: bug The issue/pr is/fixes a bug labels May 31, 2021
@t8m
Copy link
Member

t8m commented May 31, 2021

I am OK with CLA: trivial although it is borderline.

@t8m t8m added approval: done This pull request has the required number of approvals and removed approval: otc review pending labels May 31, 2021
@t8m
Copy link
Member

t8m commented May 31, 2021

@kaduk please confirm, you're OK with CLA: trivial for this change.

@kaduk
Copy link
Contributor

kaduk commented May 31, 2021

Yes, this is clearly trivial, as the openssl style guide and make update requirements force exactly what the code will look like.

@kaduk
Copy link
Contributor

kaduk commented May 31, 2021

@t8m the 1.1.1 analogue is in #15511 if you want to look there as well.

@openssl-machine
Copy link
Collaborator

24 hours has passed since 'approval: done' was set, but as this PR has been updated in that time the label 'approval: ready to merge' is not being automatically set. Please review the updates and set the label manually.

@t8m t8m added approval: ready to merge The 24 hour grace period has passed, ready to merge and removed approval: done This pull request has the required number of approvals labels Jun 1, 2021
openssl-machine pushed a commit that referenced this pull request Jun 1, 2021
When EVP_MD_CTX_new fails call SSLfatal before the goto err.
This resolves a state machine issue on the out of memory condition.

Fixes #15491.
CLA: trivial

Reviewed-by: Ben Kaduk <[email protected]>
Reviewed-by: Paul Dale <[email protected]>
Reviewed-by: Tomas Mraz <[email protected]>
(Merged from #15520)
@t8m
Copy link
Member

t8m commented Jun 1, 2021

Merged to master. Thank you for the contribution.

@t8m t8m closed this Jun 1, 2021
devnexen pushed a commit to devnexen/openssl that referenced this pull request Jul 7, 2021
When EVP_MD_CTX_new fails call SSLfatal before the goto err.
This resolves a state machine issue on the out of memory condition.

Fixes openssl#15491.
CLA: trivial

Reviewed-by: Ben Kaduk <[email protected]>
Reviewed-by: Paul Dale <[email protected]>
Reviewed-by: Tomas Mraz <[email protected]>
(Merged from openssl#15520)
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 Applies to master branch cla: trivial One of the commits is marked as 'CLA: trivial' triaged: bug The issue/pr is/fixes a bug

Projects

None yet

Development

Successfully merging this pull request may close these issues.

OPENSSL_die when EVP_MD_CTX_new allocation fails in ssl_handshake_hash

5 participants