diff options
author | Sam Roberts <vieuxtech@gmail.com> | 2019-06-03 00:10:01 +0200 |
---|---|---|
committer | Ruben Bridgewater <ruben@bridgewater.de> | 2019-06-17 21:12:13 +0200 |
commit | 8984b73033f750a4494466374278f27bf84985c9 (patch) | |
tree | ccacc4e311e7562a737ffe128502fdc581b449a0 /src/node_crypto_bio.cc | |
parent | 071694472f6d54b24dfadb0d11f34428755bec13 (diff) | |
download | android-node-v8-8984b73033f750a4494466374278f27bf84985c9.tar.gz android-node-v8-8984b73033f750a4494466374278f27bf84985c9.tar.bz2 android-node-v8-8984b73033f750a4494466374278f27bf84985c9.zip |
src: remove TLS code for unsupported OpenSSLs
Versions of OpenSSL lower than 1.1.1 are no longer supported, so remove
ifdefs for previous versions.
PR-URL: https://github.com/nodejs/node/pull/28085
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Anatoli Papirovski <apapirovski@mac.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Diffstat (limited to 'src/node_crypto_bio.cc')
-rw-r--r-- | src/node_crypto_bio.cc | 27 |
1 files changed, 0 insertions, 27 deletions
diff --git a/src/node_crypto_bio.cc b/src/node_crypto_bio.cc index 9f06801c3a..fc143043ba 100644 --- a/src/node_crypto_bio.cc +++ b/src/node_crypto_bio.cc @@ -30,16 +30,6 @@ namespace node { namespace crypto { -#if OPENSSL_VERSION_NUMBER < 0x10100000L -#define BIO_set_data(bio, data) bio->ptr = data -#define BIO_get_data(bio) bio->ptr -#define BIO_set_shutdown(bio, shutdown_) bio->shutdown = shutdown_ -#define BIO_get_shutdown(bio) bio->shutdown -#define BIO_set_init(bio, init_) bio->init = init_ -#define BIO_get_init(bio) bio->init -#endif - - BIOPointer NodeBIO::New(Environment* env) { BIOPointer bio(BIO_new(GetMethod())); if (bio && env != nullptr) @@ -231,22 +221,6 @@ long NodeBIO::Ctrl(BIO* bio, int cmd, long num, // NOLINT(runtime/int) const BIO_METHOD* NodeBIO::GetMethod() { -#if OPENSSL_VERSION_NUMBER < 0x10100000L - static const BIO_METHOD method = { - BIO_TYPE_MEM, - "node.js SSL buffer", - Write, - Read, - Puts, - Gets, - Ctrl, - New, - Free, - nullptr - }; - - return &method; -#else // This is called from InitCryptoOnce() to avoid race conditions during // initialization. static BIO_METHOD* method = nullptr; @@ -263,7 +237,6 @@ const BIO_METHOD* NodeBIO::GetMethod() { } return method; -#endif } |