(v7.x backport) src: guard bundled_ca/openssl_ca with HAVE_OPENSSL #12662
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
nodejs-github-bot
added
c++
addaleax
reviewed
Apr 26, 2017
src/node.cc
Outdated
| #if HAVE_OPENSSL | ||
| bool use_bundled_ca = false; | ||
| bool use_openssl_ca = false; | ||
| #endif // HAVE_INSPECTOR |
There was a problem hiding this comment.
Just noticed that the endif comment is off here. Also, this just adds the new variables… would they actually be necessary?
There was a problem hiding this comment.
Ah thanks, I'll fix that (#12688).
And good point, I just assumed that the other PR had been merged, but it does not seem like it. I'll add it to this one and reorder them.
danbev
force-pushed
the
v7x-guard-use_bundled_ca
branch
from
dd7b92d
to
7bdc865
Compare
evanlucas
force-pushed
the
v7.x-staging
branch
2 times, most recently
from
d4ceb59
to
69a8053
Compare
The --use-bundled-ca and --use-openssl-ca command line arguments are mutually exclusive but can both be used on the same command line. This commit adds a check if both options are used. Fixes: nodejs#12083 PR-URL: nodejs#12087 Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl> Reviewed-By: Gibson Fahnestock <gibfahn@gmail.com> Reviewed-By: Colin Ihrig <cjihrig@gmail.com> Reviewed-By: Richard Lau <riclau@uk.ibm.com> Reviewed-By: Sam Roberts <vieuxtech@gmail.com>
Currently, the following warning will be reported when configuring
without-ssl:
../src/node.cc:3653:8: warning: unused variable 'use_bundled_ca'
[-Wunused-variable]
bool use_bundled_ca = false;
^
../src/node.cc:3654:8: warning: unused variable 'use_openssl_ca'
[-Wunused-variable]
bool use_openssl_ca = false;
^
I missed this when working on
commit 8a7db9d ("src: add
--use-bundled-ca --use-openssl-ca check").
Refs: nodejs#12087
PR-URL: nodejs#12302
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Richard Lau <riclau@uk.ibm.com>
Reviewed-By: Anna Henningsen <anna@addaleax.net>
danbev
force-pushed
the
v7x-guard-use_bundled_ca
branch
from
7bdc865
to
063fd18
Compare
2 tasks
|
Unfortunately, there are no more 7.x releases planned. Sorry this was never landed! I'm going to close it now. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Currently, the following warning will be reported when configuring
without-ssl:
../src/node.cc:3653:8: warning: unused variable 'use_bundled_ca'
[-Wunused-variable]
bool use_bundled_ca = false;
^
../src/node.cc:3654:8: warning: unused variable 'use_openssl_ca'
[-Wunused-variable]
bool use_openssl_ca = false;
^
I missed this when working on
commit 8a7db9d ("src: add
--use-bundled-ca --use-openssl-ca check").
Refs: #12087
PR-URL: #12302
Reviewed-By: Colin Ihrig cjihrig@gmail.com
Reviewed-By: Richard Lau riclau@uk.ibm.com
Reviewed-By: Anna Henningsen anna@addaleax.net
Checklist
make -j4 test(UNIX), orvcbuild test(Windows) passesAffected core subsystem(s)