From 5bfbe5ceaecb6412b176db446caf00f77f84bae7 Mon Sep 17 00:00:00 2001 From: Ben Noordhuis Date: Sat, 17 Mar 2018 05:13:47 +0100 Subject: tls: drop NPN (next protocol negotiation) support MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit NPN has been superseded by ALPN. Chrome and Firefox removed support for NPN in 2016 and 2017 respectively to no ill effect. Fixes: https://github.com/nodejs/node/issues/14602 PR-URL: https://github.com/nodejs/node/pull/19403 Reviewed-By: James M Snell Reviewed-By: Tobias Nießen --- src/node_crypto.h | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-) (limited to 'src/node_crypto.h') diff --git a/src/node_crypto.h b/src/node_crypto.h index 1b2170ef85..c8cf558d60 100644 --- a/src/node_crypto.h +++ b/src/node_crypto.h @@ -249,7 +249,7 @@ class SSLWrap { static const int64_t kExternalSize = 4448 + 1024 + 42 * 1024; #endif - static void InitNPN(SecureContext* sc); + static void ConfigureSecureContext(SecureContext* sc); static void AddMethods(Environment* env, v8::Local t); #if OPENSSL_VERSION_NUMBER < 0x10100000L @@ -295,22 +295,6 @@ class SSLWrap { const v8::FunctionCallbackInfo& args); #endif // SSL_set_max_send_fragment -#ifndef OPENSSL_NO_NEXTPROTONEG - static void GetNegotiatedProto( - const v8::FunctionCallbackInfo& args); - static void SetNPNProtocols(const v8::FunctionCallbackInfo& args); - static int AdvertiseNextProtoCallback(SSL* s, - const unsigned char** data, - unsigned int* len, - void* arg); - static int SelectNextProtoCallback(SSL* s, - unsigned char** out, - unsigned char* outlen, - const unsigned char* in, - unsigned int inlen, - void* arg); -#endif // OPENSSL_NO_NEXTPROTONEG - static void GetALPNNegotiatedProto( const v8::FunctionCallbackInfo& args); static void SetALPNProtocols(const v8::FunctionCallbackInfo& args); -- cgit v1.2.3