Skip to content

Commit 4b976df

Browse files
tniessentargos
authored andcommitted
tls: fix DEP0083 after upgrading to OpenSSL 1.1.0
Setting ecdhCurve to false is already unsupported, so the deprecation should already be EOL. The test was skipped ever since we upgraded to OpenSSL 1.1.0. PR-URL: #22953 Refs: #16130 Reviewed-By: Luigi Pinca <[email protected]> Reviewed-By: Colin Ihrig <[email protected]> Reviewed-By: Ruben Bridgewater <[email protected]>
1 parent e5efdba commit 4b976df

File tree

4 files changed

+11
-82
lines changed

4 files changed

+11
-82
lines changed

doc/api/deprecations.md

+6-3
Original file line numberDiff line numberDiff line change
@@ -1628,17 +1628,20 @@ the `REPLServer` itself. Do not use this function.
16281628
### DEP0083: Disabling ECDH by setting ecdhCurve to false
16291629
<!-- YAML
16301630
changes:
1631+
- version: v10.0.0
1632+
pr-url: https://github.com/nodejs/node/pull/19794
1633+
description: End-of-Life.
16311634
- version: v9.2.0
16321635
pr-url: https://github.com/nodejs/node/pull/16130
16331636
description: Runtime deprecation.
16341637
-->
16351638
1636-
Type: Runtime
1639+
Type: End-of-Life.
16371640
16381641
The `ecdhCurve` option to `tls.createSecureContext()` and `tls.TLSSocket` could
1639-
be set to `false` to disable ECDH entirely on the server only. This mode is
1642+
be set to `false` to disable ECDH entirely on the server only. This mode was
16401643
deprecated in preparation for migrating to OpenSSL 1.1.0 and consistency with
1641-
the client. Use the `ciphers` parameter instead.
1644+
the client and is now unsupported. Use the `ciphers` parameter instead.
16421645
16431646
<a id="DEP0084"></a>
16441647
### DEP0084: requiring bundled internal dependencies

doc/api/tls.md

+5-1
Original file line numberDiff line numberDiff line change
@@ -1007,6 +1007,10 @@ argument.
10071007
<!-- YAML
10081008
added: v0.11.13
10091009
changes:
1010+
- version: v10.0.0
1011+
pr-url: https://github.com/nodejs/node/pull/19794
1012+
description: The `ecdhCurve` cannot be set to `false` anymore due to a
1013+
change in OpenSSL.
10101014
- version: v9.3.0
10111015
pr-url: https://github.com/nodejs/node/pull/14903
10121016
description: The `options` parameter can now include `clientCertEngine`.
@@ -1060,7 +1064,7 @@ changes:
10601064
discarded and DHE ciphers will not be available.
10611065
* `ecdhCurve` {string} A string describing a named curve or a colon separated
10621066
list of curve NIDs or names, for example `P-521:P-384:P-256`, to use for
1063-
ECDH key agreement, or `false` to disable ECDH. Set to `auto` to select the
1067+
ECDH key agreement. Set to `auto` to select the
10641068
curve automatically. Use [`crypto.getCurves()`][] to obtain a list of
10651069
available curve names. On recent releases, `openssl ecparam -list_curves`
10661070
will also display the name and description of each available elliptic curve.

lib/_tls_common.js

-12
Original file line numberDiff line numberDiff line change
@@ -69,16 +69,6 @@ function validateKeyCert(name, value) {
6969
exports.SecureContext = SecureContext;
7070

7171

72-
function ecdhCurveWarning() {
73-
if (ecdhCurveWarning.emitted) return;
74-
process.emitWarning('{ ecdhCurve: false } is deprecated.',
75-
'DeprecationWarning',
76-
'DEP0083');
77-
ecdhCurveWarning.emitted = true;
78-
}
79-
ecdhCurveWarning.emitted = false;
80-
81-
8272
exports.createSecureContext = function createSecureContext(options, context) {
8373
if (!options) options = {};
8474

@@ -154,8 +144,6 @@ exports.createSecureContext = function createSecureContext(options, context) {
154144
c.context.setECDHCurve(tls.DEFAULT_ECDH_CURVE);
155145
else if (options.ecdhCurve)
156146
c.context.setECDHCurve(options.ecdhCurve);
157-
else
158-
ecdhCurveWarning();
159147

160148
if (options.dhparam) {
161149
const warning = c.context.setDHParam(options.dhparam);

test/parallel/test-tls-ecdh-disable.js

-66
This file was deleted.

0 commit comments

Comments
 (0)