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_check_private_key() #45495

Merged
merged 1 commit into from Nov 19, 2022
Merged

crypto: clear OpenSSL error queue after calling X509_check_private_key() #45495

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 2 additions & 0 deletions src/crypto/crypto_x509.cc
View file
Open in desktop
Expand Up @@ -453,6 +453,8 @@ void X509Certificate::CheckPrivateKey(const FunctionCallbackInfo<Value>& args) {
ASSIGN_OR_RETURN_UNWRAP(&key, args[0]);
CHECK_EQ(key->Data()->GetKeyType(), kKeyTypePrivate);

ClearErrorOnReturn clear_error_on_return;

args.GetReturnValue().Set(
X509_check_private_key(
cert->get(),
Expand Down
17 changes: 13 additions & 4 deletions test/parallel/test-crypto-x509.js
View file
Open in desktop
Expand Up @@ -8,6 +8,7 @@ if (!common.hasCrypto)
const {
X509Certificate,
createPrivateKey,
generateKeyPairSync,
} = require('crypto');

const {
Expand Down Expand Up @@ -186,10 +187,18 @@ const der = Buffer.from(
code: 'ERR_INVALID_ARG_VALUE'
});

// Confirm failure of X509Certificate:verify() doesn't affect other functions that use OpenSSL.
assert(!x509.verify(x509.publicKey));
// This call should not throw.
createPrivateKey(key);
{
// https://github.com/nodejs/node/issues/45377
// https://github.com/nodejs/node/issues/45485
// Confirm failures of X509Certificate:verify() and X509Certificate:CheckPrivateKey()
// do not affect other functions that use OpenSSL.
// Subsequent calls to e.g. createPrivateKey should not throw.
const keyPair = generateKeyPairSync('ed25519');
assert(!x509.verify(keyPair.publicKey));
createPrivateKey(key);
assert(!x509.checkPrivateKey(keyPair.privateKey));
createPrivateKey(key);
}

// X509Certificate can be cloned via MessageChannel/MessagePort
const mc = new MessageChannel();
Expand Down