crypto: Remove unused access of tlsext_hostname. #10882

davidben · 2017-01-18T20:25:43Z

The return value of loadSession is ultimately ignored, so don't fill it in. This inches Node closer to 1.1.0 compatibility and is less code.

Also remove a comment which appears to have long since become invalid. It dates to 048e0e7 when the SNI value was actually extracted from the session.

This also fixes a segfault should d2i_SSL_SESSION fail to parse the input and return NULL.

Checklist

make -j4 test (UNIX), or vcbuild test (Windows) passes
tests and/or benchmarks are included
commit message follows commit guidelines

Affected core subsystem(s)

crypto

davidben · 2017-01-18T20:26:13Z

src/node_crypto.cc

@@ -1816,17 +1816,6 @@ void SSLWrap<Base>::LoadSession(const FunctionCallbackInfo<Value>& args) {
    if (w->next_sess_ != nullptr)
      SSL_SESSION_free(w->next_sess_);
    w->next_sess_ = sess;


I just left the error case silently ignoring it. Happy to change it if you'd prefer something else.

davidben · 2017-01-18T20:26:37Z

test/parallel/test-tls-invalid-session.js

@@ -0,0 +1,94 @@
+'use strict';
+const common = require('../common');


This file is basically entirely copied from test-tls-session-cache.js with tweaks, so it's probably doing more than it actually needs to.

can you just add the condition you are testing to test-tls-session-cache.js?

mscdex · 2017-01-18T20:39:55Z

/cc @indutny

bnoordhuis

LGTM but would it be possible to merge the test into the existing test? It's duplicating quite a bit of finicky code right now.

davidben · 2017-01-18T21:02:35Z

@bnoordhuis Oh yeah, that's much tidier. Done.

indutny

LGTM

bnoordhuis

LGTM, thanks. CI: https://ci.nodejs.org/job/node-test-pull-request/5946/

It's possible the ARM buildbots report failure while the status is green when you click through. Known issue, can be safely ignored.

sam-github

Please run make test - the linter failure is real.

davidben · 2017-01-19T22:27:18Z

@sam-github Oops. Fixed.

bnoordhuis · 2017-01-25T18:33:13Z

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

davidben · 2017-01-25T20:08:15Z

I see some red in that link, but I'm not sure how to read it. What's the error?

sam-github · 2017-01-25T20:25:23Z

test/arm is known to fail, sqaush and force push, and I'll retest

sam-github · 2017-01-25T20:25:36Z

also, rebase against master

sam-github · 2017-01-25T20:26:26Z

And fix the commit message, it should be

crypto: remove unused access of tlsext_hostname

No capital, no period.

The return value of loadSession is ultimately ignored, so don't fill it in. This inches Node closer to 1.1.0 compatibility and is less code. Also remove a comment which appears to have long since become invalid. It dates to 048e0e7 when the SNI value was actually extracted from the session. This also fixes a segfault should d2i_SSL_SESSION fail to parse the input and return NULL. Add a test for this case based on test-tls-session-cache.js.

davidben · 2017-01-25T21:09:44Z

Squashed and rebased (and comment reworded).

jasnell · 2017-02-02T20:32:05Z

ping @sam-github

sam-github · 2017-02-13T21:57:15Z

Landed in e34ee1d

The return value of loadSession is ultimately ignored, so don't fill it in. This inches Node closer to 1.1.0 compatibility and is less code. Also remove a comment which appears to have long since become invalid. It dates to 048e0e7 when the SNI value was actually extracted from the session. This also fixes a segfault should d2i_SSL_SESSION fail to parse the input and return NULL. Add a test for this case based on test-tls-session-cache.js. PR-URL: #10882 Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl> Reviewed-By: Fedor Indutny <fedor.indutny@gmail.com> Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Sam Roberts <vieuxtech@gmail.com>

The return value of loadSession is ultimately ignored, so don't fill it in. This inches Node closer to 1.1.0 compatibility and is less code. Also remove a comment which appears to have long since become invalid. It dates to 048e0e7 when the SNI value was actually extracted from the session. This also fixes a segfault should d2i_SSL_SESSION fail to parse the input and return NULL. Add a test for this case based on test-tls-session-cache.js. PR-URL: nodejs#10882 Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl> Reviewed-By: Fedor Indutny <fedor.indutny@gmail.com> Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Sam Roberts <vieuxtech@gmail.com>

jasnell · 2017-03-07T17:49:13Z

needs a backport PR in order to land on v4 or v6

davidben · 2017-03-07T19:55:09Z

To clarify, is that a request for me to put one together or just a note for you all? (I'm not familiar with how your branching arrangement works.)

jasnell · 2017-03-07T21:01:57Z

@davidben ... just a note :-) if someone felt that this needed to go into v6 or v4, then a manual backport would be required because the commit is not landing cleanly as is. Feel free to ignore :-)

sam-github · 2017-03-08T15:43:37Z

I think we should backport as much as possible, not because we desperately need this PR, but because if we don't land it, subsequent PRs might start not backporting as easily due to conflicts.

@davidben if this applies to 6.x and 4.x (it looks like it would), do you have time to backport?

davidben · 2017-03-08T22:59:22Z

Looks like the reason it doesn't apply cleanly is because of #10685 and #10698 which were not backported. Though those two really don't apply cleanly. :-)

I dunno how far back you want to go here. Doing just the merge is straightforward enough; I can either switch all my lets back to vars and strictEquals to equals or leave them alone and assume the existing lines will be done by a future backport. Dunno if that would just cause more trouble by getting things out of order. (Do you intend to backport those two?)

sam-github · 2017-03-09T04:30:11Z

Its not clear at this moment what should be backported. Lets wait and see. @gibfahn did the two PRs you mentioned by running eslint in fixup mode, it would probably be easier to repeat that than to actually backport.

gibfahn · 2017-03-09T08:03:23Z

@davidben Yep, let me backport those two PRs first.

nodejs-github-bot added c++ Issues and PRs that require attention from people who are familiar with C++. crypto Issues and PRs related to the crypto subsystem. tls Issues and PRs related to the tls subsystem. lts-watch-v6.x labels Jan 18, 2017

davidben commented Jan 18, 2017

View reviewed changes

mscdex removed the crypto Issues and PRs related to the crypto subsystem. label Jan 18, 2017

bnoordhuis approved these changes Jan 18, 2017

View reviewed changes

nodejs-github-bot added dont-land-on-v7.x and removed lts-watch-v6.x labels Jan 18, 2017

indutny approved these changes Jan 18, 2017

View reviewed changes

bnoordhuis approved these changes Jan 19, 2017

View reviewed changes

jasnell approved these changes Jan 19, 2017

View reviewed changes

mscdex removed the dont-land-on-v7.x label Jan 19, 2017

sam-github suggested changes Jan 19, 2017

View reviewed changes

nodejs-github-bot added the dont-land-on-v7.x label Jan 19, 2017

mscdex removed the dont-land-on-v7.x label Jan 20, 2017

davidben force-pushed the session-hostname branch from 8f60462 to 71a8e7f Compare January 25, 2017 21:09

nodejs-github-bot added the dont-land-on-v7.x label Jan 25, 2017

targos removed the dont-land-on-v7.x label Jan 28, 2017

sam-github approved these changes Feb 11, 2017

View reviewed changes

sam-github closed this Feb 13, 2017

italoacasas mentioned this pull request Feb 14, 2017

Proposal - 7.6.0 (Current) #11185

Merged

ChALkeR mentioned this pull request Feb 15, 2017

src: remove unused variable #11361

Closed

2 tasks

jasnell added dont-land-on-v4.x labels Mar 7, 2017

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

crypto: Remove unused access of tlsext_hostname. #10882

crypto: Remove unused access of tlsext_hostname. #10882

davidben commented Jan 18, 2017

davidben Jan 18, 2017

davidben Jan 18, 2017

sam-github Jan 18, 2017

davidben Jan 18, 2017

mscdex commented Jan 18, 2017

bnoordhuis left a comment

davidben commented Jan 18, 2017

indutny left a comment

bnoordhuis left a comment

sam-github left a comment

davidben commented Jan 19, 2017

bnoordhuis commented Jan 25, 2017

davidben commented Jan 25, 2017

sam-github commented Jan 25, 2017

sam-github commented Jan 25, 2017

sam-github commented Jan 25, 2017

davidben commented Jan 25, 2017 •

edited

Loading

jasnell commented Feb 2, 2017

sam-github commented Feb 13, 2017

jasnell commented Mar 7, 2017

davidben commented Mar 7, 2017

jasnell commented Mar 7, 2017

sam-github commented Mar 8, 2017

davidben commented Mar 8, 2017

sam-github commented Mar 9, 2017

gibfahn commented Mar 9, 2017

		@@ -0,0 +1,94 @@
		'use strict';
		const common = require('../common');

crypto: Remove unused access of tlsext_hostname. #10882

crypto: Remove unused access of tlsext_hostname. #10882

Conversation

davidben commented Jan 18, 2017

Checklist

Affected core subsystem(s)

davidben Jan 18, 2017

Choose a reason for hiding this comment

davidben Jan 18, 2017

Choose a reason for hiding this comment

sam-github Jan 18, 2017

Choose a reason for hiding this comment

davidben Jan 18, 2017

Choose a reason for hiding this comment

mscdex commented Jan 18, 2017

bnoordhuis left a comment

Choose a reason for hiding this comment

davidben commented Jan 18, 2017

indutny left a comment

Choose a reason for hiding this comment

bnoordhuis left a comment

Choose a reason for hiding this comment

sam-github left a comment

Choose a reason for hiding this comment

davidben commented Jan 19, 2017

bnoordhuis commented Jan 25, 2017

davidben commented Jan 25, 2017

sam-github commented Jan 25, 2017

sam-github commented Jan 25, 2017

sam-github commented Jan 25, 2017

davidben commented Jan 25, 2017 • edited Loading

jasnell commented Feb 2, 2017

sam-github commented Feb 13, 2017

jasnell commented Mar 7, 2017

davidben commented Mar 7, 2017

jasnell commented Mar 7, 2017

sam-github commented Mar 8, 2017

davidben commented Mar 8, 2017

sam-github commented Mar 9, 2017

gibfahn commented Mar 9, 2017

davidben commented Jan 25, 2017 •

edited

Loading