diff options
| author | Shigeki Ohtsu <ohtsu@ohtsu.org> | 2017-03-02 23:13:19 +0900 |
|---|---|---|
| committer | Shigeki Ohtsu <ohtsu@ohtsu.org> | 2017-03-03 14:08:42 +0900 |
| commit | 02c98f480c57c02d1db3d679e8b601695f20a4ef (patch) | |
| tree | 680390991b72c81475487cf5e877960b9583f15d /src/node_constants.cc | |
| parent | 4e05952a8a75af6df625415db612d3a9a1322682 (diff) | |
| download | android-node-v8-02c98f480c57c02d1db3d679e8b601695f20a4ef.tar.gz android-node-v8-02c98f480c57c02d1db3d679e8b601695f20a4ef.tar.bz2 android-node-v8-02c98f480c57c02d1db3d679e8b601695f20a4ef.zip | |
tls: fix macro to check NPN feature
In order to check if NPN feature is enabled, use
`#ifndef OPENSSL_NO_NEXTPROTONEG` rather than
`#ifdef OPENSSL_NPN_NEGOTIATED` because the former is used in ssl.h.
Fixes: https://github.com/nodejs/node/issues/11650
PR-URL: https://github.com/nodejs/node/pull/11655
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Michael Dawson <michael_dawson@ca.ibm.com>
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Fedor Indutny <fedor@indutny.com>
Diffstat (limited to 'src/node_constants.cc')
| -rw-r--r-- | src/node_constants.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/node_constants.cc b/src/node_constants.cc index 8aa65ee7e2..a7c2d89906 100644 --- a/src/node_constants.cc +++ b/src/node_constants.cc @@ -942,7 +942,7 @@ void DefineOpenSSLConstants(Local<Object> target) { NODE_DEFINE_CONSTANT(target, DH_NOT_SUITABLE_GENERATOR); #endif -#ifdef OPENSSL_NPN_NEGOTIATED +#ifndef OPENSSL_NO_NEXTPROTONEG #define NPN_ENABLED 1 NODE_DEFINE_CONSTANT(target, NPN_ENABLED); #endif |