Skip to content

tls: use the most recently added matching SecureContext in default SN… - #36072

Merged
Trott merged 1 commit into
nodejs:masterfrom
mkrawczuk:34110_2
Jan 15, 2021
Merged

tls: use the most recently added matching SecureContext in default SN…#36072
Trott merged 1 commit into
nodejs:masterfrom
mkrawczuk:34110_2

Conversation

@mkrawczuk

@mkrawczukmkrawczuk commented Nov 10, 2020•
edited by Trott
Loading

Copy link
Copy Markdown
Contributor

Sorry, ruined the previous PR (#34638) with a merge.

Fixes: #34110

Checklist
  • make -j4 test (UNIX), or vcbuild test (Windows) passes
  • tests and/or benchmarks are included
  • documentation is changed or added
  • commit message follows commit guidelines

@nodejs-github-botnodejs-github-bot added the tls Issues and PRs related to the tls subsystem. label Nov 10, 2020
@mkrawczukmkrawczuk mentioned this pull request Nov 10, 2020
Closed
4 tasks
mscdex
mscdex reviewed Nov 10, 2020
View reviewed changes
Comment threadtest/parallel/test-tls-secure-context-usage-order.js Outdated
mscdex
mscdex reviewed Nov 10, 2020
View reviewed changes
Comment threadtest/parallel/test-tls-secure-context-usage-order.js Outdated

@mscdexmscdexNov 10, 2020

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

minor nit: we could be more strict here and assert that these are equal depending on the current step, same for the other conditional below

Trott
Trott reviewed Nov 12, 2020
View reviewed changes
Comment threaddoc/api/tls.md Outdated
@Trott

Trott commented Nov 12, 2020

Copy link
Copy Markdown
Member

@nodejs/crypto @addaleax

@Trott
Trott requested a review from addaleaxNovember 16, 2020 14:41
@mkrawczuk

mkrawczuk commented Dec 16, 2020

Copy link
Copy Markdown
ContributorAuthor

Rebased. cc @addaleax

@TrottTrott added the request-ci Add this label to start a Jenkins CI on a PR. label Dec 23, 2020
@github-actionsgithub-actionsBot removed the request-ci Add this label to start a Jenkins CI on a PR. label Dec 23, 2020
@nodejs-github-bot

nodejs-github-bot commented Dec 23, 2020

Copy link
Copy Markdown
Collaborator

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

@mkrawczuk

mkrawczuk commented Dec 23, 2020

Copy link
Copy Markdown
ContributorAuthor

Did a clear rebase, because the previous one failed. @Trott you might want to request another CI.

@nodejs-github-bot

nodejs-github-bot commented Dec 28, 2020

Copy link
Copy Markdown
Collaborator

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

@mkrawczuk@Trott
tls: use recently added matching SecureContext in default SNICallback
8cf5281
PR-URL: nodejs#36072Fixes: nodejs#34110
Reviewed-By: Rich Trott <rtrott@gmail.com>
Reviewed-By: Anna Henningsen <anna@addaleax.net>
@Trott

Trott commented Jan 15, 2021

Copy link
Copy Markdown
Member

Landed in 8cf5281

@Trott
Trott merged commit 8cf5281 into nodejs:masterJan 15, 2021
ruyadorno pushed a commit that referenced this pull request Jan 22, 2021
@mkrawczuk@ruyadorno
tls: use recently added matching SecureContext in default SNICallback
864b97b
PR-URL: #36072Fixes: #34110
Reviewed-By: Rich Trott <rtrott@gmail.com>
Reviewed-By: Anna Henningsen <anna@addaleax.net>
@ruyadornoruyadorno mentioned this pull request Jan 22, 2021
Merged
@Ethan-ArrowoodEthan-Arrowood mentioned this pull request Aug 6, 2024
Closed
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@TrottTrottTrott approved these changes
@addaleaxaddaleaxaddaleax approved these changes
+1 more reviewer
@mscdexmscdexmscdex left review comments
Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

tlsIssues and PRs related to the tls subsystem.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

tls: server.addContext does not update the context if there was one registered for a given servername wildcard.

6 participants

@mkrawczuk@Trott@nodejs-github-bot@mscdex@addaleax@targos