Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 2 additions & 1 deletion lib/.eslintrc.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -293,7 +293,7 @@ overrides:
- ./internal/structured_clone.js
- ./internal/test/*.js
- ./internal/test_runner/**/*.js
- ./internal/tls/secure-context.js
- ./internal/tls/*.js
- ./internal/util/parse_args/*.js
- ./internal/v8_prof_processor.js
- ./internal/vm.js
Expand All @@ -306,6 +306,7 @@ overrides:
- ./stream/*.js
- ./sys.js
- ./test.js
- ./tls.js
- ./url.js
- ./util/*.js
rules:
Expand Down
10 changes: 5 additions & 5 deletions lib/_tls_wrap.js
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ const {
ERR_TLS_REQUIRED_SERVER_NAME,
ERR_TLS_SESSION_ATTACK,
ERR_TLS_SNI_FROM_SERVER,
ERR_TLS_INVALID_STATE
ERR_TLS_INVALID_STATE,
} = codes;
const { onpskexchange: kOnPskExchange } = internalBinding('symbols');
const {
Expand All @@ -97,7 +97,7 @@ const {
validateUint32,
} = require('internal/validators');
const {
InternalX509Certificate
InternalX509Certificate,
} = require('internal/crypto/x509');
const traceTls = getOptionValue('--trace-tls');
const tlsKeylog = getOptionValue('--tls-keylog');
Expand Down Expand Up @@ -653,7 +653,7 @@ function defineHandleReading(socket, handle) {
},
set: (value) => {
socket[kRes].reading = value;
}
},
});
}

Expand Down Expand Up @@ -1379,7 +1379,7 @@ Server.prototype.setSecureContext = function(options) {

Server.prototype._getServerData = function() {
return {
ticketKeys: this.getTicketKeys().toString('hex')
ticketKeys: this.getTicketKeys().toString('hex'),
};
};

Expand Down Expand Up @@ -1615,7 +1615,7 @@ exports.connect = function connect(...args) {
ciphers: tls.DEFAULT_CIPHERS,
checkServerIdentity: tls.checkServerIdentity,
minDHSize: 1024,
...options
...options,
};

if (!options.keepAlive)
Expand Down
2 changes: 1 addition & 1 deletion lib/internal/tls/secure-pair.js
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ class SecurePair extends EventEmitter {
isServer,
requestCert,
rejectUnauthorized,
...options
...options,
});
this.cleartext.once('secure', () => this.emit('secure'));
}
Expand Down
2 changes: 1 addition & 1 deletion lib/tls.js
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ const {
const {
ERR_TLS_CERT_ALTNAME_FORMAT,
ERR_TLS_CERT_ALTNAME_INVALID,
ERR_OUT_OF_RANGE
ERR_OUT_OF_RANGE,
} = require('internal/errors').codes;
const internalUtil = require('internal/util');
internalUtil.assertCrypto();
Expand Down