Skip to content

Comments

Fix the info callback#5874

Closed
mattcaswell wants to merge 4 commits intoopenssl:masterfrom
mattcaswell:info-callback
Closed

Fix the info callback#5874
mattcaswell wants to merge 4 commits intoopenssl:masterfrom
mattcaswell:info-callback

Conversation

@mattcaswell
Copy link
Member

The info callback was not receiving all the handshake start and done events that it should in TLSv1.3. This fixes it and adds a test. I also updated the documentation to explain the meaning of the various events in a TLSv1.3 context.

Fixes #5721.

Checklist
  • documentation is added or updated
  • tests are added or updated

@mattcaswell
Copy link
Member Author

The travis and appveyor failures do not appear relevant (ping @levitte - seems to be something to do with the new versions.c file)

@levitte
Copy link
Member

levitte commented Apr 4, 2018

?????

Uhmmmmm... the appveyor failure looks weird... why does the compilation of test\versinos.obj have no /I parameters at all?

As for the Travis one, impossible to analyse because of the ... wisdom of making make silent. Would you mind hacking the default jobs to set BUILDONLY=yes in .travis.yml, specially for this PR, so we have a closer look at what's happening? Meanwhile, I'll have a closer look at the Windows stuff.

@levitte
Copy link
Member

levitte commented Apr 4, 2018

BTW, you might want to not include test/versions in this PR ;-)
(we need to add it in .gitignore)

@levitte
Copy link
Member

levitte commented Apr 4, 2018

Ahhhh, it's actually the test/versions that's in this PR that throws the build system off... Configure detects it and gets the info in %unified_info screwed up as soon as you build out-of-source... all the cases that succeed build in-source...

That was unforeseen, I'll have a look at Configure to make it more robust against this kind of, err, "attack"

@levitte
Copy link
Member

levitte commented Apr 4, 2018

But, suffice to say, removing test/versions from this PR will fix the odd build failures

@mattcaswell
Copy link
Member Author

Gah!! Thanks. Update force pushed.

I'm off to update .gitignore...

@richsalz richsalz added the approval: done This pull request has the required number of approvals label Apr 16, 2018
The first session ticket sent by the server is actually tacked onto the
end of the first handshake from a state machine perspective. However in
reality this is a post-handshake message, and should be preceeded by a
handshake start event from an info callback perspective.
Make sure the info callback gets called in all the places we expect it to.
@mattcaswell
Copy link
Member Author

There was a merge conflict with master. Rebased.

@richsalz - can you reconfirm?

@richsalz
Copy link
Contributor

Reconfirm.

@mattcaswell
Copy link
Member Author

Pushed. Thanks.

levitte pushed a commit that referenced this pull request Apr 17, 2018
levitte pushed a commit that referenced this pull request Apr 17, 2018
The first session ticket sent by the server is actually tacked onto the
end of the first handshake from a state machine perspective. However in
reality this is a post-handshake message, and should be preceeded by a
handshake start event from an info callback perspective.

Reviewed-by: Rich Salz <[email protected]>
(Merged from #5874)
levitte pushed a commit that referenced this pull request Apr 17, 2018
Make sure the info callback gets called in all the places we expect it to.

Reviewed-by: Rich Salz <[email protected]>
(Merged from #5874)
levitte pushed a commit that referenced this pull request Apr 17, 2018
mattcaswell added a commit to mattcaswell/openssl that referenced this pull request Apr 23, 2018
This dead code should have been removed as part of openssl#5874 but got missed.

Found by Coverity.
@mattcaswell mattcaswell mentioned this pull request Apr 23, 2018
2 tasks
levitte pushed a commit that referenced this pull request Apr 24, 2018
This dead code should have been removed as part of #5874 but got missed.

Found by Coverity.

Reviewed-by: Rich Salz <[email protected]>
Reviewed-by: Paul Dale <[email protected]>
(Merged from #6049)
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

Projects

None yet

Development

Successfully merging this pull request may close these issues.

TLSv1.3 unexpected InfoCallback after handshake completed

3 participants