Skip to content

crypto: throw on uninitialized DH computeSecret #63922

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

Open
panva wants to merge 1 commit into
base: main
Choose a base branch
from
+35 −0
Open

crypto: throw on uninitialized DH computeSecret #63922

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
7 changes: 7 additions & 0 deletions deps/ncrypto/ncrypto.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1710,6 +1710,13 @@ DataPointer DHPointer::getPrivateKey() const {
return BignumPointer::Encode(pvt_key);
}

bool DHPointer::hasPrivateKey() const {
if (!dh_) return false;
const BIGNUM* pvt_key = nullptr;
DH_get0_key(dh_.get(), nullptr, &pvt_key);
return pvt_key != nullptr;
}

DataPointer DHPointer::generateKeys() const {
ClearErrorOnReturn clearErrorOnReturn;
if (!dh_) return {};
Expand Down
1 change: 1 addition & 0 deletions deps/ncrypto/ncrypto.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1116,6 +1116,7 @@ class DHPointer final {
DataPointer getGenerator() const;
DataPointer getPublicKey() const;
DataPointer getPrivateKey() const;
bool hasPrivateKey() const;
DataPointer generateKeys() const;
DataPointer computeSecret(const BignumPointer& peer) const;

Expand Down
5 changes: 5 additions & 0 deletions src/crypto/crypto_dh.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -324,6 +324,11 @@ void ComputeSecret(const FunctionCallbackInfo<Value>& args) {
break;
}

if (!dh.hasPrivateKey()) {
return THROW_ERR_CRYPTO_INVALID_STATE(
env, "Cannot compute shared secret without a private key");
}

auto dp = dh.computeSecret(key);

Local<Value> buffer;
Expand Down
22 changes: 22 additions & 0 deletions test/parallel/test-crypto-dh-errors.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,28 @@ assert.throws(
'failed to throw the expected error.'
);

{
const group = crypto.getDiffieHellman('modp14');
const alice = crypto.createDiffieHellman(
group.getPrime(), group.getGenerator());
const bob = crypto.createDiffieHellman(
group.getPrime(), group.getGenerator());
bob.generateKeys();

assert.throws(
() => alice.computeSecret(bob.getPublicKey()),
{
name: 'Error',
code: 'ERR_CRYPTO_INVALID_STATE',
message: 'Cannot compute shared secret without a private key'
});

alice.generateKeys();
assert.deepStrictEqual(
alice.computeSecret(bob.getPublicKey()),
bob.computeSecret(alice.getPublicKey()));
}

assert.throws(
() => crypto.createDiffieHellman('', true),
{
Expand Down
Loading