Skip to content
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

Jump to bottom

crypto: clear OpenSSL error queue after calling X509_verify() #45377

Merged
merged 4 commits into from
Nov 17, 2022
Merged

crypto: clear OpenSSL error queue after calling X509_verify() #45377

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b65799c
crypto: clear OpenSSL error queue after calling X509_verify()
takuro-sato Nov 8, 2022
2775ffc
use ClearErrorOnReturn instead of ERR_clear_error()
takuro-sato Nov 8, 2022
5003cc9
improve comment
takuro-sato Nov 8, 2022
f26f710
improve comment
takuro-sato Nov 8, 2022
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
2 changes: 2 additions & 0 deletions src/crypto/crypto_x509.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -468,6 +468,8 @@ void X509Certificate::Verify(const FunctionCallbackInfo<Value>& args) {
ASSIGN_OR_RETURN_UNWRAP(&key, args[0]);
CHECK_EQ(key->Data()->GetKeyType(), kKeyTypePublic);

ClearErrorOnReturn clear_error_on_return;

args.GetReturnValue().Set(
X509_verify(
cert->get(),
Expand Down
5 changes: 5 additions & 0 deletions test/parallel/test-crypto-x509.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,6 +186,11 @@ const der = Buffer.from(
code: 'ERR_INVALID_ARG_VALUE'
});

// Confirm failure of X509Certificate:verify() doesn't affect other functions that use OpenSSL
takuro-sato marked this conversation as resolved.
Show resolved Hide resolved
assert(!x509.verify(x509.publicKey));
// It should not throw
takuro-sato marked this conversation as resolved.
Show resolved Hide resolved
createPrivateKey(key);

// X509Certificate can be cloned via MessageChannel/MessagePort
const mc = new MessageChannel();
mc.port1.onmessage = common.mustCall(({ data }) => {
Expand Down