src: mark/pop OpenSSL errors in NewRootCertStore #35514
Closed
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
|
Review requested:
|
nodejs-github-bot
added
build
Trott
approved these changes
Oct 6, 2020
github-actions
bot
removed
the
request-ci
addaleax
approved these changes
Oct 6, 2020
cjihrig
approved these changes
Oct 6, 2020
|
@nodejs/platform-smartos This isn't compiling successfully on SmartOS (and there's now a commit to add code to skip SmartOS). Thoughts? You can see the compilation failure in either of the first two CI runs above. |
|
I haven't tried to debug this locally, but would |
The function |
Does it need to remain static? |
Good question, I'm not really sure if it does or not. |
This commit sets the OpenSSL error mark before calling X509_STORE_load_locations and pops the error mark afterwards. The motivation for this is that it is possible that X509_STORE_load_locations can produce errors if the configuration option --openssl-system-ca-path file does not exist. Later if a different function is called which calls an OpenSSL function it could fail because these errors might still be on the OpenSSL error stack. Currently, all functions that call NewRootCertStore clear the OpenSSL error queue upon returning, but this was not the case for example in v12.18.0. Fixes: nodejs#35456
danbev
force-pushed
the
crypto_system_cert_path
branch
from
d806af4
to
0ab510b
Compare
|
I think it would be fine to move the declaration into the header file |
danbev
force-pushed
the
crypto_system_cert_path
branch
from
503f592
to
9117d4f
Compare
Codecov Report
@@ Coverage Diff @@
## master #35514 +/- ##
==========================================
- Coverage 96.87% 96.40% -0.48%
==========================================
Files 212 220 +8
Lines 69641 73681 +4040
==========================================
+ Hits 67466 71031 +3565
- Misses 2175 2650 +475
Continue to review full report at Codecov.
|
|
Re-run of failing node-test-commit-linux-containered/ ✔️ |
danbev
added a commit
that referenced
this pull request
Oct 21, 2020
This commit sets the OpenSSL error mark before calling X509_STORE_load_locations and pops the error mark afterwards. The motivation for this is that it is possible that X509_STORE_load_locations can produce errors if the configuration option --openssl-system-ca-path file does not exist. Later if a different function is called which calls an OpenSSL function it could fail because these errors might still be on the OpenSSL error stack. Currently, all functions that call NewRootCertStore clear the OpenSSL error queue upon returning, but this was not the case for example in v12.18.0. PR-URL: #35514 Fixes: #35456 Reviewed-By: Rich Trott <[email protected]> Reviewed-By: Anna Henningsen <[email protected]> Reviewed-By: Colin Ihrig <[email protected]>
|
Landed in 610c68c. |
BethGriggs
pushed a commit
that referenced
this pull request
Oct 21, 2020
This commit sets the OpenSSL error mark before calling X509_STORE_load_locations and pops the error mark afterwards. The motivation for this is that it is possible that X509_STORE_load_locations can produce errors if the configuration option --openssl-system-ca-path file does not exist. Later if a different function is called which calls an OpenSSL function it could fail because these errors might still be on the OpenSSL error stack. Currently, all functions that call NewRootCertStore clear the OpenSSL error queue upon returning, but this was not the case for example in v12.18.0. PR-URL: #35514 Fixes: #35456 Reviewed-By: Rich Trott <[email protected]> Reviewed-By: Anna Henningsen <[email protected]> Reviewed-By: Colin Ihrig <[email protected]>
Merged
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.
This commit sets the OpenSSL error mark before calling
X509_STORE_load_locationsand pops the error mark afterwards.The motivation for this is that it is possible that
X509_STORE_load_locationscan produce errors if the configurationoption
--openssl-system-ca-pathfile does not exist. Later if adifferent function is called which calls an OpenSSL function it could
fail because these errors might still be on the OpenSSL error queue.
Currently, all functions that call
NewRootCertStoreclear theOpenSSL error queue upon returning, but this was not the case for
example in v12.18.0.
Fixes: #35456
Checklist
make -j4 test(UNIX), orvcbuild test(Windows) passes