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

Avoid segfault in SSL_export_keying material if there is no session #12594

Closed
wants to merge 2 commits into from

Conversation

@t8m
Copy link
Member

@t8m t8m commented Aug 6, 2020

Fixes #12588

Not sure if this fixes all the possible cases of segfaulting in SSL_export_keying_material. But at least it fixes the example case in the bug report.

Copy link
Member

@mattcaswell mattcaswell left a comment

Can we add a test for this in test_export_key_mat in sslapitest.c?

@t8m
Copy link
Member Author

@t8m t8m commented Aug 6, 2020

Will do.

@t8m
Copy link
Member Author

@t8m t8m commented Aug 6, 2020

Added

@t8m t8m force-pushed the t8m:export-keying-segfault branch to 0e5c362 Aug 6, 2020
Copy link
Member

@mattcaswell mattcaswell left a comment

LGTM

@openssl-machine
Copy link

@openssl-machine openssl-machine commented Aug 7, 2020

This pull request is ready to merge

openssl-machine pushed a commit that referenced this pull request Aug 13, 2020
Fixes #12588

Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from #12594)
openssl-machine pushed a commit that referenced this pull request Aug 13, 2020
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from #12594)
openssl-machine pushed a commit that referenced this pull request Aug 13, 2020
Fixes #12588

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

(cherry picked from commit dffeec1)
openssl-machine pushed a commit that referenced this pull request Aug 13, 2020
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from #12594)

(cherry picked from commit ea9f689)
@t8m
Copy link
Member Author

@t8m t8m commented Aug 13, 2020

Merged to master and 1.1.1

@t8m t8m closed this Aug 13, 2020
swenkeratmicrosoft pushed a commit to swenkeratmicrosoft/openssl that referenced this pull request Sep 1, 2020
Fixes openssl#12588

Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from openssl#12594)
swenkeratmicrosoft pushed a commit to swenkeratmicrosoft/openssl that referenced this pull request Sep 1, 2020
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from openssl#12594)
@t8m t8m deleted the t8m:export-keying-segfault branch Jan 22, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

3 participants