TLSv1.3: fix padding extension #2968
Closed
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
In OpenSSL 1.1.0 the padding extension MUST be last because it calculates the length of everything that has been written into the ClientHello to determine whether it needs to be padded or not. With TLSv1.3 that isn't possible because the specification requires that the PSK extension is last. Therefore we need to fix the padding extension to take account of any PSK extension that will be later added.
levitte
requested changes
Mar 16, 2017
test/clienthellotest.c
Outdated
|
|
||
| return testresult?0:1; | ||
| return testresult; |
There was a problem hiding this comment.
I would remove the use of testresult entirely and just:
return run_tests(argv[0]);
mattcaswell
force-pushed
the
tls1_3-fix-padding
branch
from
ccdca80
to
2b2e6c9
Compare
Check that the padding extension pads correctly for various scenarios.
mattcaswell
force-pushed
the
tls1_3-fix-padding
branch
from
2b2e6c9
to
4bf3c4c
Compare
|
Updated to take account of feedback. Also fixed an issue with out-of-tree builds (could not find the session file) |
richsalz
suggested changes
Mar 16, 2017
test/clienthellotest.c
Outdated
| int test_main(int argc, char *argv[]) | ||
| { | ||
| if (argc != 2) | ||
| return 0; |
There was a problem hiding this comment.
or return EXIT_FAILURE, that will make it easier to understand.
|
New commit pushed which addresses above feedback. It also fixes a problem where TLSv1.3 is not enabled. |
richsalz
approved these changes
Mar 16, 2017
| @@ -751,6 +784,12 @@ int tls_construct_ctos_psk(SSL *s, WPACKET *pkt, unsigned int context, X509 *x, | |||
| s->session->ext.tick_identity = TLSEXT_PSK_BAD_IDENTITY; | |||
|
|
|||
| /* | |||
| * Note: At this stage we only support adding a single resumption PSK. If | |||
There was a problem hiding this comment.
at this stage of the code, or the protocol?
|
+1 |
|
Pushed. Thanks. |
levitte
pushed a commit
that referenced
this pull request
Mar 16, 2017
In OpenSSL 1.1.0 the padding extension MUST be last because it calculates the length of everything that has been written into the ClientHello to determine whether it needs to be padded or not. With TLSv1.3 that isn't possible because the specification requires that the PSK extension is last. Therefore we need to fix the padding extension to take account of any PSK extension that will be later added. Reviewed-by: Rich Salz <rsalz@openssl.org> (Merged from #2968)
levitte
pushed a commit
that referenced
this pull request
Mar 16, 2017
Check that the padding extension pads correctly for various scenarios. Reviewed-by: Rich Salz <rsalz@openssl.org> (Merged from #2968)
levitte
pushed a commit
that referenced
this pull request
Mar 16, 2017
Reviewed-by: Rich Salz <rsalz@openssl.org> (Merged from #2968)
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
In OpenSSL 1.1.0 the padding extension MUST be last because it calculates
the length of everything that has been written into the ClientHello to
determine whether it needs to be padded or not. With TLSv1.3 that isn't
possible because the specification requires that the PSK extension is last.
Therefore we need to fix the padding extension to take account of any PSK
extension that will be later added.