Skip to content

src: reduce scope of variables throughout codebase #23297

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
cjihrig merged 7 commits into from
Oct 9, 2018
Merged

src: reduce scope of variables throughout codebase #23297

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
8ea20b7
src: reduce variable scope in cares_wrap.cc
cjihrig Oct 6, 2018
2c5195a
src: reduce variable scope in module_wrap.cc
cjihrig Oct 6, 2018
78b4369
src: remove unneeded variables in node_crypto.cc
cjihrig Oct 6, 2018
e649ba9
src: reduce variable scope in node_url.cc
cjihrig Oct 6, 2018
2c7409f
src: reduce variable scope in node_trace_writer.cc
cjihrig Oct 6, 2018
7ee8323
src: reduce variable scope in node_worker.cc
cjihrig Oct 6, 2018
f7bfbb8
src: reduce variable scope in stream_base.cc
cjihrig Oct 6, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
src: remove unneeded variables in node_crypto.cc 
PR-URL: #23297
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: Joyee Cheung <joyeec9h3@gmail.com>
Reviewed-By: Refael Ackermann <refack@gmail.com>
Reviewed-By: Gabriel Schulhof <gabriel.schulhof@intel.com>
Reviewed-By: Trivikram Kamat <trivikr.dev@gmail.com>
Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de>
Reviewed-By: James M Snell <jasnell@gmail.com>
  • Loading branch information
@cjihrig
cjihrig committed Oct 9, 2018
commit 78b4369f093d0070bdd22e1b994feb7336c47cfd
25 changes: 8 additions & 17 deletions src/node_crypto.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -573,17 +573,13 @@ int SSL_CTX_use_certificate_chain(SSL_CTX* ctx,
if (ret) {
// If we could set up our certificate, now proceed to
// the CA certificates.
int r;

SSL_CTX_clear_extra_chain_certs(ctx);

for (int i = 0; i < sk_X509_num(extra_certs); i++) {
X509* ca = sk_X509_value(extra_certs, i);

// NOTE: Increments reference count on `ca`
r = SSL_CTX_add1_chain_cert(ctx, ca);

if (!r) {
if (!SSL_CTX_add1_chain_cert(ctx, ca)) {
ret = 0;
issuer = nullptr;
break;
Expand Down Expand Up @@ -1580,15 +1576,11 @@ static Local<Object> X509ToObject(Environment* env, X509* cert) {
if (index < 0)
continue;

X509_EXTENSION* ext;
int rv;

ext = X509_get_ext(cert, index);
X509_EXTENSION* ext = X509_get_ext(cert, index);
CHECK_NOT_NULL(ext);

if (!SafeX509ExtPrint(bio.get(), ext)) {
rv = X509V3_EXT_print(bio.get(), ext, 0, 0);
CHECK_EQ(rv, 1);
CHECK_EQ(1, X509V3_EXT_print(bio.get(), ext, 0, 0));
}

BIO_get_mem_ptr(bio.get(), &mem);
Expand Down Expand Up @@ -3746,7 +3738,6 @@ SignBase::Error Verify::VerifyFinal(const char* key_pem,
EVPKeyPointer pkey;
unsigned char m[EVP_MAX_MD_SIZE];
unsigned int m_len;
int r = 0;
*verify_result = false;
EVPMDPointer mdctx = std::move(mdctx_);

Expand All @@ -3762,11 +3753,11 @@ SignBase::Error Verify::VerifyFinal(const char* key_pem,
ApplyRSAOptions(pkey, pkctx.get(), padding, saltlen) &&
EVP_PKEY_CTX_set_signature_md(pkctx.get(),
EVP_MD_CTX_md(mdctx.get())) > 0) {
r = EVP_PKEY_verify(pkctx.get(),
reinterpret_cast<const unsigned char*>(sig),
siglen,
m,
m_len);
const int r = EVP_PKEY_verify(pkctx.get(),
reinterpret_cast<const unsigned char*>(sig),
siglen,
m,
m_len);
*verify_result = r == 1;
}

Expand Down