Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/nodejs/node.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Bevenius <daniel.bevenius@gmail.com>2020-10-06 14:25:23 +0300
committerBeth Griggs <Bethany.Griggs@uk.ibm.com>2020-10-21 17:51:34 +0300
commit6a7a61be7c58809990f42659c1d114233c9d1d3e (patch)
tree1aa08584aa95c86470a4097f7279af27aaa074b3 /node.gyp
parentc509485c196ebfdf7c3baf8b57d28cab1e0108ab (diff)
src: mark/pop OpenSSL errors in NewRootCertStore
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: https://github.com/nodejs/node/pull/35514 Fixes: https://github.com/nodejs/node/issues/35456 Reviewed-By: Rich Trott <rtrott@gmail.com> Reviewed-By: Anna Henningsen <anna@addaleax.net> Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Diffstat (limited to 'node.gyp')
-rw-r--r--node.gyp3
1 files changed, 3 insertions, 0 deletions
diff --git a/node.gyp b/node.gyp
index dd9bddd08ba..c4bf4411cfd 100644
--- a/node.gyp
+++ b/node.gyp
@@ -1360,6 +1360,9 @@
'defines': [
'HAVE_OPENSSL=1',
],
+ 'sources': [
+ 'test/cctest/test_node_crypto.cc',
+ ]
}],
[ 'node_use_openssl=="true" and experimental_quic==1', {
'defines': [