TLS check temp key type #2191
Closed
TLS check temp key type #2191
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add option ExpectedTmpKeyType to test the temporary key the server sends is of the correct type.
kroeckx
reviewed
Jan 8, 2017
| @@ -1038,6 +1039,19 @@ static HANDSHAKE_RESULT *do_handshake_internal( | |||
| if (session_out != NULL) | |||
| *session_out = SSL_get1_session(client.ssl); | |||
|
|
|||
| if (SSL_get_server_tmp_key(client.ssl, &tmp_key)) { | |||
| int nid; | |||
There was a problem hiding this comment.
Some people seem to want a blank line here, but our style document doesn't seem to say anything about it.
There was a problem hiding this comment.
We should add it to the style document as it has become a defacto standard style in recent reviews.
mattcaswell
approved these changes
Jan 8, 2017
| __owur static int parse_expected_tmp_key_type(SSL_TEST_CTX *test_ctx, | ||
| const char *value) | ||
| { | ||
| int nid; |
mattcaswell
added
the
approval: done
kroeckx
approved these changes
Jan 8, 2017
snhenson
force-pushed
the
tls_check_tmp_key
branch
from
c2025f9
to
ca4d8db
Compare
rhuijben
pushed a commit
to rhuijben/openssl
that referenced
this pull request
Jan 8, 2017
Add option ExpectedTmpKeyType to test the temporary key the server sends is of the correct type. Reviewed-by: Kurt Roeckx <kurt@openssl.org> Reviewed-by: Matt Caswell <matt@openssl.org> (Merged from openssl/openssl#2191)
rhuijben
pushed a commit
to rhuijben/openssl
that referenced
this pull request
Jan 8, 2017
Reviewed-by: Kurt Roeckx <kurt@openssl.org> Reviewed-by: Matt Caswell <matt@openssl.org> (Merged from openssl/openssl#2191)
rhuijben
pushed a commit
to rhuijben/openssl
that referenced
this pull request
Jan 8, 2017
Reviewed-by: Kurt Roeckx <kurt@openssl.org> Reviewed-by: Matt Caswell <matt@openssl.org> (Merged from openssl/openssl#2191) (cherry picked from commit 9c4319b)
rhuijben
pushed a commit
to rhuijben/openssl
that referenced
this pull request
Jan 8, 2017
Add option ExpectedTmpKeyType to test the temporary key the server sends is of the correct type. Reviewed-by: Kurt Roeckx <kurt@openssl.org> Reviewed-by: Matt Caswell <matt@openssl.org> (Merged from openssl/openssl#2191) (cherry picked from commit b93ad05)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Checklist
Description of change
This adds a new test option so we can check the server temp key is of the expected type. It also extends the existing curve selection test to check the curve the server uses.