Skip to content

src: refactor TLSWrap#35552

Closed
jasnell wants to merge 1 commit intonodejs:masterfrom
jasnell:refactor-tlswrap
Closed

src: refactor TLSWrap#35552
jasnell wants to merge 1 commit intonodejs:masterfrom
jasnell:refactor-tlswrap

Conversation

@jasnell
Copy link
Member

@jasnell jasnell commented Oct 8, 2020

This accomplishes a couple of things...

  • Previously, TLSWrap and SSLWrap were defined separately, with SSLWrap as an abstract template class presumably with the intent of allowing it to be reused in other ways that never actually happened. Here they are collapsed and SSLWrap is eliminated entirely

  • Updates and modernizes the code inside TLSWrap

While this is semver-patch, it depends on the currently semver-major #35093

Checklist
  • make -j4 test (UNIX), or vcbuild test (Windows) passes
  • commit message follows commit guidelines

@nodejs-github-bot
Copy link
Collaborator

nodejs-github-bot commented Oct 8, 2020

Review requested:

  • @nodejs/crypto
  • @nodejs/quic

@nodejs-github-bot nodejs-github-bot added c++ Issues and PRs that require attention from people who are familiar with C++. lib / src Issues and PRs related to general changes in the lib or src directory. labels Oct 8, 2020
@jasnell jasnell added crypto Issues and PRs related to the crypto subsystem. request-ci Add this label to start a Jenkins CI on a PR. labels Oct 10, 2020
@github-actions github-actions bot removed the request-ci Add this label to start a Jenkins CI on a PR. label Oct 10, 2020
@nodejs-github-bot
Copy link
Collaborator

nodejs-github-bot commented Oct 10, 2020

CI: https://ci.nodejs.org/job/node-test-pull-request/33519/

@jasnell
Copy link
Member Author

jasnell commented Oct 10, 2020

Heh, some definite failures in CI ;-) ... moving this back to draft until I can take a look

@jasnell jasnell marked this pull request as draft October 10, 2020 17:50
@mildsunrise
Copy link
Contributor

mildsunrise commented Oct 12, 2020

thank you! I was going to open a PR for this same thing

@jasnell
Copy link
Member Author

jasnell commented Oct 12, 2020

Awesome. It's almost done. Have to trace down a couple of failing tests that aren't exactly obvious with regards to why they're failing but it's close

@jasnell
src: combine TLSWrap/SSLWrap
963fe0f 
SSLWrap was needlessly defined as a template class, splitting the
TLS implementation over multiple locations. The original idea, I
surmise, was to make it possible to reuse SSLWrap for some other
purpose that never manifest. This squashes them down into a single
TLSWrap class and moves tls_wrap.h/cc into src/crypto.

Signed-off-by: James M Snell <jasnell@gmail.com>
@jasnell jasnell marked this pull request as ready for review October 12, 2020 15:21
@jasnell jasnell added the request-ci Add this label to start a Jenkins CI on a PR. label Oct 12, 2020
@jasnell
Copy link
Member Author

jasnell commented Oct 12, 2020

@mildsunrise (and others) this should be good to go now :-)

@github-actions github-actions bot removed the request-ci Add this label to start a Jenkins CI on a PR. label Oct 12, 2020
@nodejs-github-bot

This comment has been minimized.

Sign in to view
@nodejs-github-bot

This comment has been minimized.

Sign in to view
@nodejs-github-bot

This comment has been minimized.

Sign in to view
@nodejs-github-bot

This comment has been minimized.

Sign in to view
@jasnell
Copy link
Member Author

jasnell commented Oct 13, 2020

Dealing with some seemingly unrelated CI failures on this. Running CI again to see what happens

@jasnell jasnell added the request-ci Add this label to start a Jenkins CI on a PR. label Oct 15, 2020
@github-actions github-actions bot removed the request-ci Add this label to start a Jenkins CI on a PR. label Oct 15, 2020
@nodejs-github-bot

This comment has been minimized.

Sign in to view
@mildsunrise
Copy link
Contributor

mildsunrise commented Oct 15, 2020

will this be backported? I initially assumed so, but it depends on a semver-major change, so 🤔

@mildsunrise
Copy link
Contributor

mildsunrise commented Oct 15, 2020 •
edited
Loading

also, context for newer contributors who arrive here: SSLWrap was previously used as a common base for SecurePair (the old TLS API) and TLSWrap (the current tls.Socket API) IIRC. We completely removed SecurePair a while ago (it's now an emulation layer on top of tls.Socket), so it no longer makes sense to keep both classes.

@snyk-bot snyk-bot mentioned this pull request May 10, 2022
Open
@137717unity 137717unity mentioned this pull request May 10, 2022
Open
@baby636 baby636 mentioned this pull request May 10, 2022
Open
@kissofire kissofire mentioned this pull request May 10, 2022
Open
@wedataintelligence wedataintelligence mentioned this pull request May 10, 2022
Open
@ron-a20 ron-a20 mentioned this pull request May 10, 2022
Open
@molllyn1 molllyn1 mentioned this pull request May 11, 2022
Open
@snyk-bot snyk-bot mentioned this pull request Sep 25, 2022
Open
@wedataintelligence wedataintelligence mentioned this pull request Sep 26, 2022
Open
@137717unity 137717unity mentioned this pull request Sep 26, 2022
Open
@snyk-bot snyk-bot mentioned this pull request Sep 27, 2022
Open
@wedataintelligence wedataintelligence mentioned this pull request Sep 29, 2022
Open
This was referenced Sep 29, 2022
Open
Open
This was referenced Oct 5, 2022
Open
Open
@snyk-bot snyk-bot mentioned this pull request Oct 6, 2022
Open
@137717unity 137717unity mentioned this pull request Oct 7, 2022
Open
@wedataintelligence wedataintelligence mentioned this pull request Oct 7, 2022
Open
This was referenced Oct 8, 2022
Open
Open
@137717unity 137717unity mentioned this pull request Oct 9, 2022
Open
@snyk-bot snyk-bot mentioned this pull request Oct 9, 2022
Open
@kissofire kissofire mentioned this pull request Oct 25, 2022
Open
@molllyn1 molllyn1 mentioned this pull request Oct 26, 2022
Open
@baby636 baby636 mentioned this pull request Oct 26, 2022
Open
@snyk-bot snyk-bot mentioned this pull request Oct 26, 2022
Open
@wedataintelligence wedataintelligence mentioned this pull request Oct 26, 2022
Open
This was referenced Oct 26, 2022
Open
Open
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

1 more reviewer

@mildsunrise mildsunrise mildsunrise approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

c++ Issues and PRs that require attention from people who are familiar with C++. crypto Issues and PRs related to the crypto subsystem. lib / src Issues and PRs related to general changes in the lib or src directory.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@jasnell @nodejs-github-bot @mildsunrise @targos @BethGriggs