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

crypto: throw errors in SignTraits::DeriveBits #40796

Merged
merged 1 commit into from
Nov 15, 2021
Merged

crypto: throw errors in SignTraits::DeriveBits #40796

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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 14 additions & 5 deletions src/crypto/crypto_sig.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -738,19 +738,25 @@ bool SignTraits::DeriveBits(
size_t len;
unsigned char* data = nullptr;
if (IsOneShot(params.key)) {
EVP_DigestSign(
if (!EVP_DigestSign(
context.get(),
nullptr,
&len,
params.data.data<unsigned char>(),
params.data.size());
params.data.size())) {
crypto::CheckThrow(env, SignBase::Error::kSignPrivateKey);
return false;
}
data = MallocOpenSSL<unsigned char>(len);
EVP_DigestSign(
if (!EVP_DigestSign(
context.get(),
data,
&len,
params.data.data<unsigned char>(),
params.data.size());
params.data.size())) {
crypto::CheckThrow(env, SignBase::Error::kSignPrivateKey);
return false;
}
ByteSource buf =
ByteSource::Allocated(reinterpret_cast<char*>(data), len);
*out = std::move(buf);
Expand All @@ -760,13 +766,16 @@ bool SignTraits::DeriveBits(
params.data.data<unsigned char>(),
params.data.size()) ||
!EVP_DigestSignFinal(context.get(), nullptr, &len)) {
crypto::CheckThrow(env, SignBase::Error::kSignPrivateKey);
return false;
}
data = MallocOpenSSL<unsigned char>(len);
ByteSource buf =
ByteSource::Allocated(reinterpret_cast<char*>(data), len);
if (!EVP_DigestSignFinal(context.get(), data, &len))
if (!EVP_DigestSignFinal(context.get(), data, &len)) {
crypto::CheckThrow(env, SignBase::Error::kSignPrivateKey);
return false;
}

if (UseP1363Encoding(params.key, params.dsa_encoding)) {
*out = ConvertSignatureToP1363(env, params.key, buf);
Expand Down
14 changes: 14 additions & 0 deletions test/parallel/test-crypto-sign-verify.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -742,3 +742,17 @@ assert.throws(
}
}
}

// The sign function should not swallow OpenSSL errors.
// Regression test for /~https://github.com/nodejs/node/issues/40794.
{
assert.throws(() => {
const { privateKey } = crypto.generateKeyPairSync('rsa', {
modulusLength: 512
});
crypto.sign('sha512', 'message', privateKey);
}, {
code: 'ERR_OSSL_RSA_DIGEST_TOO_BIG_FOR_RSA_KEY',
message: /digest too big for rsa key/
});
}