diff options
| author | Ben Noordhuis <info@bnoordhuis.nl> | 2018-03-17 05:13:47 +0100 |
|---|---|---|
| committer | Ben Noordhuis <info@bnoordhuis.nl> | 2018-03-27 16:22:37 +0200 |
| commit | 5bfbe5ceaecb6412b176db446caf00f77f84bae7 (patch) | |
| tree | 4c3a6696de1c1116046144473cac5e1389564790 /src/node_crypto.h | |
| parent | b3f23910a25613eb289fe4b338f83783a9f731b3 (diff) | |
| download | android-node-v8-5bfbe5ceaecb6412b176db446caf00f77f84bae7.tar.gz android-node-v8-5bfbe5ceaecb6412b176db446caf00f77f84bae7.tar.bz2 android-node-v8-5bfbe5ceaecb6412b176db446caf00f77f84bae7.zip | |
tls: drop NPN (next protocol negotiation) support
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 <jasnell@gmail.com>
Reviewed-By: Tobias Nießen <tniessen@tnie.de>
Diffstat (limited to 'src/node_crypto.h')
| -rw-r--r-- | src/node_crypto.h | 18 |
1 files changed, 1 insertions, 17 deletions
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<v8::FunctionTemplate> t); #if OPENSSL_VERSION_NUMBER < 0x10100000L @@ -295,22 +295,6 @@ class SSLWrap { const v8::FunctionCallbackInfo<v8::Value>& args); #endif // SSL_set_max_send_fragment -#ifndef OPENSSL_NO_NEXTPROTONEG - static void GetNegotiatedProto( - const v8::FunctionCallbackInfo<v8::Value>& args); - static void SetNPNProtocols(const v8::FunctionCallbackInfo<v8::Value>& 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<v8::Value>& args); static void SetALPNProtocols(const v8::FunctionCallbackInfo<v8::Value>& args); |