diff options
| author | Ben Noordhuis <info@bnoordhuis.nl> | 2018-06-02 10:52:59 +0200 |
|---|---|---|
| committer | Anna Henningsen <anna@addaleax.net> | 2018-06-08 00:53:37 +0200 |
| commit | a76f0298184115971bac56dd369418786569f76d (patch) | |
| tree | a337f105fb3c0cd36e53098d4badbadab2bbde49 /src/node_crypto.h | |
| parent | efdc1a44bb540375110720882f3f978cf20b1259 (diff) | |
| download | android-node-v8-a76f0298184115971bac56dd369418786569f76d.tar.gz android-node-v8-a76f0298184115971bac56dd369418786569f76d.tar.bz2 android-node-v8-a76f0298184115971bac56dd369418786569f76d.zip | |
lib,src: remove openssl feature conditionals
Remove compile-time and run-time conditionals for features that
OpenSSL 1.0.0 and 1.0.1 didn't support: ALPN, OCSP and/or SNI.
They are no longer necessary since our baseline is OpenSSL 1.0.2.
PR-URL: https://github.com/nodejs/node/pull/21094
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Tobias Nießen <tniessen@tnie.de>
Reviewed-By: Trivikram Kamat <trivikr.dev@gmail.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Diffstat (limited to 'src/node_crypto.h')
| -rw-r--r-- | src/node_crypto.h | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/src/node_crypto.h b/src/node_crypto.h index 8d40f85099..4587a96e72 100644 --- a/src/node_crypto.h +++ b/src/node_crypto.h @@ -53,10 +53,6 @@ #include <openssl/rand.h> #include <openssl/pkcs12.h> -#if !defined(OPENSSL_NO_TLSEXT) && defined(SSL_CTX_set_tlsext_status_cb) -# define NODE__HAVE_TLSEXT_STATUS_CB -#endif // !defined(OPENSSL_NO_TLSEXT) && defined(SSL_CTX_set_tlsext_status_cb) - namespace node { namespace crypto { @@ -331,13 +327,8 @@ class SSLWrap { ClientHelloParser hello_parser_; -#ifdef NODE__HAVE_TLSEXT_STATUS_CB Persistent<v8::Object> ocsp_response_; -#endif // NODE__HAVE_TLSEXT_STATUS_CB - -#ifdef SSL_CTRL_SET_TLSEXT_SERVERNAME_CB Persistent<v8::Value> sni_context_; -#endif friend class SecureContext; }; |