Skip to content

v10.16.1 proposal #28731

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 33 commits into from
Jul 31, 2019
Merged

v10.16.1 proposal #28731

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
819a647
esm: fix esm load bug
ZYSzys May 13, 2019
cc3ca08
test: clearing require cache crashes esm loader
aduh95 May 2, 2019
8f780e8
deps: cherry-pick 88f8fe1 from upstream V8
hashseed Nov 20, 2018
609d2b9
deps: V8: backport f27ac28
targos Jun 4, 2019
5ffe047
tls: renegotiate should take care of its own state
sam-github Feb 7, 2019
08a32fb
src: elevate v8 namespaces for node_process.cc
Jayasankar-m Nov 23, 2018
65ef26f
async_hooks: avoid double-destroy HTTPParser
Flarna May 30, 2019
0dee607
src: extract common Bind method
maclover7 Aug 14, 2018
14090b5
worker: fix nullptr deref after MessagePort deser failure
addaleax Dec 16, 2018
a8f78f0
src: fulfill Maybe contract in InlineDecoder
addaleax Dec 19, 2018
b7dbc1c
src: fix warning in cares_wrap.cc
cjihrig Dec 26, 2018
b3d8a1b
doc: add missing changes entry
BridgeAR Nov 30, 2018
76af23a
src: remove internalBinding('config').warningFile
joyeecheung Dec 11, 2018
044e753
stream: make _read() be called indefinitely if the user wants so
mcollina Feb 15, 2019
274b97c
stream: do not unconditionally call `_read()` on `resume()`
addaleax Mar 28, 2019
f34bb96
process: make stdout and stderr emit 'close' on destroy
mcollina Mar 15, 2019
f3841c6
stream: convert existing buffer when calling .setEncoding
addaleax May 28, 2019
ad588eb
doc: adjust TOC margins
silverwind Jun 5, 2019
b689008
src: in-source comments and minor TLS cleanups
sam-github Jan 16, 2019
f9e8e88
src: fix Get() usage in tls_wrap.cc
cjihrig Nov 3, 2018
99dad28
tls: add CHECK for impossible condition
addaleax Mar 21, 2019
75052ca
tls: add debugging to native TLS code
addaleax Mar 21, 2019
35be08a
test: clean up build files
Jun 19, 2019
39637cb
test: skip tests related to CI failures on AIX
sam-github Jun 28, 2019
2ae9916
test: skip stringbytes-external-exceed-max on AIX
sam-github Jul 2, 2019
ada0ed5
test: fix pty test hangs on aix
bnoordhuis Jul 8, 2019
c59e0c2
deps: updated openssl upgrade instructions
sam-github Jun 12, 2019
9e62852
deps: upgrade openssl sources to 1.1.1c
sam-github Jun 12, 2019
8f5d6cf
deps: update archs files for OpenSSL-1.1.1c
sam-github Jun 12, 2019
4a607fa
tools: replace rollup with ncc
Trott Dec 3, 2018
f332265
test: remove `util.inherits()` usage
ZYSzys Dec 28, 2018
0339fba
src: handle empty Maybe in uv binding initialize
addaleax Dec 17, 2018
a395299
2019-07-31, Version 10.16.1 'Dubnium' (LTS)
BethGriggs Jul 17, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
tls: renegotiate should take care of its own state 
In the initial version of this test there were two zero-length writes to
force tls state to cycle. The second is not necessary, at least not now,
but the first was. The renegotiate() API should ensure that packet
exchange takes place, not its users, so move the zero-length write into
tls.

See: #14239
See: b1909d3a70f9

Backport-PR-URL: #27938
PR-URL: #25997
Reviewed-By: Anna Henningsen <[email protected]>
Reviewed-By: James M Snell <[email protected]>
Reviewed-By: Colin Ihrig <[email protected]>
  • Loading branch information
@sam-github @BethGriggs
sam-github authored and BethGriggs committed Jun 7, 2019
commit 5ffe04753e372c06826c76b57ece2888fbd05208
3 changes: 3 additions & 0 deletions lib/_tls_wrap.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -573,6 +573,9 @@ TLSSocket.prototype.renegotiate = function(options, callback) {
this._requestCert = requestCert;
this._rejectUnauthorized = rejectUnauthorized;
}
// Ensure that we'll cycle through internal openssl's state
this.write('');

if (!this._handle.renegotiate()) {
if (callback) {
process.nextTick(callback, new ERR_TLS_RENEGOTIATE());
Expand Down
2 changes: 0 additions & 2 deletions test/parallel/test-tls-disable-renegotiation.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,6 @@ server.listen(0, common.mustCall(() => {
port
};
const client = tls.connect(options, common.mustCall(() => {
client.write('');
// Negotiation is still permitted for this first
// attempt. This should succeed.
let ok = client.renegotiate(options, common.mustCall((err) => {
Expand All @@ -56,7 +55,6 @@ server.listen(0, common.mustCall(() => {
// data event on the server. After that data
// is received, disableRenegotiation is called.
client.write('data', common.mustCall(() => {
client.write('');
// This second renegotiation attempt should fail
// and the callback should never be invoked. The
// server will simply drop the connection after
Expand Down