Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: nodejs/node
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 151cca6c9d0f92fb4bd505176bfec7ffeef77f31
Choose a base ref
...
head repository: nodejs/node
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 43411669f6c1016ef59c0cd30b4601c9ccc3e3ec
Choose a head ref
  • 5 commits
  • 12 files changed
  • 3 contributors

Commits on Jan 19, 2017

  1. tls, crypto: add ALPN Support 

    cherry-pick 802a2e7 from v6-staging.

ALPN is added to tls according to RFC7301, which supersedes NPN.
When the server receives both NPN and ALPN extensions from the client,
ALPN takes precedence over NPN and the server does not send NPN
extension to the client. alpnProtocol in TLSSocket always returns
false when no selected protocol exists by ALPN.
In https server, http/1.1 token is always set when no
options.ALPNProtocols exists.

PR-URL: #2564
Reviewed-By: Fedor Indutny <fedor@indutny.com>
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
    Shigeki Ohtsu @MylesBorins
    Shigeki Ohtsu authored and MylesBorins committed Jan 19, 2017
    Configuration menu
    Copy the full SHA
    1a40f2d View commit details
    Browse the repository at this point in the history

  2. tls,crypto: move NPN protcol data to hidden value 

    cherry-pick 7eee372 from v6-staging.

This fix is to be consistent implementation with ALPN. Tow NPN
protocol data in the persistent memebers move to hidden variables in
the wrap object.

PR-URL: #2564
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
    Shigeki Ohtsu @MylesBorins
    Shigeki Ohtsu authored and MylesBorins committed Jan 19, 2017
    Configuration menu
    Copy the full SHA
    d706c0d View commit details
    Browse the repository at this point in the history

  3. test: fix alpn tests for openssl1.0.2h 

    cherry-pick 65030c7 from v6-staging.

openssl/openssl@af2db04
changed some ALPN behaviors. The tests when ALPN has no selection
should be fixed because openssl was changed NPN callback to be invoked
in this case.

Fixes: #6458
PR-URL: #6550
Reviewed-By: Myles Borins <myles.borins@gmail.com>
Reviewed-By: Fedor Indutny <fedor.indutny@gmail.com>
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
    Shigeki Ohtsu @MylesBorins
    Shigeki Ohtsu authored and MylesBorins committed Jan 19, 2017
    Configuration menu
    Copy the full SHA
    43ee08f View commit details
    Browse the repository at this point in the history

  4. tls: copy the Buffer object before using 

    cherry-pick c26b9af from v6-staging.

`convertNPNProtocols` and `convertALPNProtocols' uses the `protocols`
buffer object as it is, and if it is modified outside of core, it
might have an impact. This patch makes a copy of the buffer object,
before using it.

PR-URL: #8055
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Franziska Hinkelmann <franziska.hinkelmann@gmail.com>
    @thefourtheye @MylesBorins
    thefourtheye authored and MylesBorins committed Jan 19, 2017
    Configuration menu
    Copy the full SHA
    15462eb View commit details
    Browse the repository at this point in the history

  5. crypto: remove unnecessary variables of alpn/npn 

    The Local variables of `npn_buffer` and `alpn_buffer` are not
necessary to be created from `args[0]`. Remove and fold them into the
subsequent call.

PR-URL: #10831
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Myles Borins <myles.borins@gmail.com>
    @shigeki @MylesBorins
    shigeki authored and MylesBorins committed Jan 19, 2017
    Configuration menu
    Copy the full SHA
    4341166 View commit details
    Browse the repository at this point in the history
Loading