tls: move convertNPNProtocols to End-of-Life

This was deprecated in 10.0.0 because NPN support was removed. It does not make sense to keep this around longer than 10.x PR-URL: #20736 Reviewed-By: Rich Trott <[email protected]> Reviewed-By: Colin Ihrig <[email protected]> Reviewed-By: Daniel Bevenius <[email protected]> Reviewed-By: Yuta Hiroto <[email protected]> Reviewed-By: Ben Noordhuis <[email protected]> Reviewed-By: Tobias Nießen <[email protected]> Reviewed-By: Michaël Zasso <[email protected]> Reviewed-By: Matteo Collina <[email protected]> Reviewed-By: Ruben Bridgewater <[email protected]> Reviewed-By: Trivikram Kamat <[email protected]> Reviewed-By: Ali Ijaz Sheikh <[email protected]>
nodejs · May 17, 2018 · 4d00cd4 · 4d00cd4
1 parent 8d38288
commit 4d00cd4
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 29 deletions.
diff --git a/benchmark/tls/convertprotocols.js b/benchmark/tls/convertprotocols.js
@@ -12,11 +12,11 @@ function main({ n }) {
   var m = {};
   // First call dominates results
   if (n > 1) {
-    tls.convertNPNProtocols(input, m);
+    tls.convertALPNProtocols(input, m);
     m = {};
   }
   bench.start();
   for (var i = 0; i < n; i++)
-    tls.convertNPNProtocols(input, m);
+    tls.convertALPNProtocols(input, m);
   bench.end(n);
 }
diff --git a/doc/api/deprecations.md b/doc/api/deprecations.md
@@ -977,7 +977,7 @@ objects respectively.
 <a id="DEP0107"></a>
 ### DEP0107: tls.convertNPNProtocols()
 
-Type: Runtime
+Type: End-of-Life
 
 This was an undocumented helper function not intended for use outside Node.js
 core and obsoleted by the removal of NPN (Next Protocol Negotiation) support.

diff --git a/lib/tls.js b/lib/tls.js
@@ -76,16 +76,6 @@ function convertProtocols(protocols) {
   return buff;
 }
 
-exports.convertNPNProtocols = internalUtil.deprecate(function(protocols, out) {
-  // If protocols is Array - translate it into buffer
-  if (Array.isArray(protocols)) {
-    out.NPNProtocols = convertProtocols(protocols);
-  } else if (isUint8Array(protocols)) {
-    // Copy new buffer not to be modified by user.
-    out.NPNProtocols = Buffer.from(protocols);
-  }
-}, 'tls.convertNPNProtocols() is deprecated.', 'DEP0107');
-
 exports.convertALPNProtocols = function(protocols, out) {
   // If protocols is Array - translate it into buffer
   if (Array.isArray(protocols)) {

diff --git a/test/parallel/test-tls-basic-validations.js b/test/parallel/test-tls-basic-validations.js
@@ -93,25 +93,9 @@ common.expectsError(
   assert(out.ALPNProtocols.equals(Buffer.from('efgh')));
 }
 
-{
-  const buffer = Buffer.from('abcd');
-  const out = {};
-  tls.convertNPNProtocols(buffer, out);
-  out.NPNProtocols.write('efgh');
-  assert(buffer.equals(Buffer.from('abcd')));
-  assert(out.NPNProtocols.equals(Buffer.from('efgh')));
-}
-
 {
   const buffer = new Uint8Array(Buffer.from('abcd'));
   const out = {};
   tls.convertALPNProtocols(buffer, out);
   assert(out.ALPNProtocols.equals(Buffer.from('abcd')));
 }
-
-{
-  const buffer = new Uint8Array(Buffer.from('abcd'));
-  const out = {};
-  tls.convertNPNProtocols(buffer, out);
-  assert(out.NPNProtocols.equals(Buffer.from('abcd')));
-}