From 335bbff96d75a29bd38cf4f9926b76bbf8ce3846 Mon Sep 17 00:00:00 2001 From: David Benjamin Date: Sat, 16 Sep 2017 03:16:17 -0400 Subject: [PATCH] crypto: remove unnecessary SSLerr calls These are OpenSSL-internal APIs that are no longer accessible in 1.1.0 and weren't necessary. OpenSSL will push its own errors and, if it doesn't, the calling code would handle it anyway. PR-URL: https://github.com/nodejs/node/pull/16130 Backport-PR-URL: https://github.com/nodejs/node/pull/18622 Reviewed-By: Ben Noordhuis Reviewed-By: Rod Vagg --- src/node_crypto.cc | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/node_crypto.cc b/src/node_crypto.cc index 441f8cdf4b954c..5b4872952360c8 100644 --- a/src/node_crypto.cc +++ b/src/node_crypto.cc @@ -667,7 +667,6 @@ int SSL_CTX_use_certificate_chain(SSL_CTX* ctx, x = PEM_read_bio_X509_AUX(in, nullptr, NoPasswordCallback, nullptr); if (x == nullptr) { - SSLerr(SSL_F_SSL_CTX_USE_CERTIFICATE_CHAIN_FILE, ERR_R_PEM_LIB); return 0; } @@ -678,7 +677,6 @@ int SSL_CTX_use_certificate_chain(SSL_CTX* ctx, // Read extra certs STACK_OF(X509)* extra_certs = sk_X509_new_null(); if (extra_certs == nullptr) { - SSLerr(SSL_F_SSL_CTX_USE_CERTIFICATE_CHAIN_FILE, ERR_R_MALLOC_FAILURE); goto done; }