mirrors/bun.sh
1
0
Fork 0
mirror of https://github.com/oven-sh/bun synced 2026-02-11 19:38:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(crypto): remove verifyError from DiffieHellman.prototype (#18710)

Browse Source
This commit is contained in:
Dylan Conway
2025-04-02 14:24:36 -07:00
committed by GitHub
parent ebb03afae0
commit 0efbbd3870
4 changed files with 67 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/bun.js/bindings/node/crypto/JSDiffieHellman.cpp
View File

@@ -9,14 +9,19 @@
#include <JavaScriptCore/LazyClassStructureInlines.h>
#include <JavaScriptCore/FunctionPrototype.h>
#include <JavaScriptCore/ObjectPrototype.h>
#include "JSDOMExceptionHandling.h"
namespace Bun {
JSC_DECLARE_HOST_FUNCTION(jsDiffieHellmanGetter_verifyError);
const JSC::ClassInfo JSDiffieHellman::s_info = { "DiffieHellman"_s, &Base::s_info, nullptr, nullptr, CREATE_METHOD_TABLE(JSDiffieHellman) };
void JSDiffieHellman::finishCreation(JSC::VM& vm, JSC::JSGlobalObject* globalObject)
{
Base::finishCreation(vm);
JSC_NATIVE_GETTER("verifyError"_s, jsDiffieHellmanGetter_verifyError, PropertyAttribute::ReadOnly | PropertyAttribute::Accessor);
m_sizeForGC = this->m_dh.size();
vm.heap.reportExtraMemoryAllocated(this, m_sizeForGC);
}
@@ -47,4 +52,26 @@ void setupDiffieHellmanClassStructure(JSC::LazyClassStructure::Initializer& init
init.setConstructor(constructor);
}
JSC_DEFINE_HOST_FUNCTION(jsDiffieHellmanGetter_verifyError, (JSC::JSGlobalObject * globalObject, JSC::CallFrame* callFrame))
{
JSC::VM& vm = globalObject->vm();
auto scope = DECLARE_THROW_SCOPE(vm);
JSValue thisValue = callFrame->thisValue();
JSDiffieHellman* thisObject = JSC::jsDynamicCast<JSDiffieHellman*>(thisValue);
if (UNLIKELY(!thisObject)) {
throwVMTypeError(globalObject, scope);
return {};
}
auto& dh = thisObject->getImpl();
auto result = dh.check();
if (result == ncrypto::DHPointer::CheckResult::CHECK_FAILED) {
return Bun::ERR::CRYPTO_OPERATION_FAILED(scope, globalObject, "Checking DH parameters failed"_s);
}
return JSC::JSValue::encode(JSC::jsNumber(static_cast<int>(result)));
}
} // namespace Bun

24
src/bun.js/bindings/node/crypto/JSDiffieHellmanGroup.cpp
View File

@@ -12,11 +12,14 @@
namespace Bun {
JSC_DECLARE_HOST_FUNCTION(jsDiffieHellmanGroupGetter_verifyError);
const JSC::ClassInfo JSDiffieHellmanGroup::s_info = { "DiffieHellmanGroup"_s, &Base::s_info, nullptr, nullptr, CREATE_METHOD_TABLE(JSDiffieHellmanGroup) };
void JSDiffieHellmanGroup::finishCreation(JSC::VM& vm, JSC::JSGlobalObject* globalObject)
{
Base::finishCreation(vm);
JSC_NATIVE_GETTER("verifyError"_s, jsDiffieHellmanGroupGetter_verifyError, PropertyAttribute::ReadOnly | PropertyAttribute::Accessor);
m_sizeForGC = this->m_dh.size();
vm.heap.reportExtraMemoryAllocated(this, m_sizeForGC);
@@ -48,4 +51,25 @@ void setupDiffieHellmanGroupClassStructure(JSC::LazyClassStructure::Initializer&
init.setConstructor(constructor);
}
JSC_DEFINE_HOST_FUNCTION(jsDiffieHellmanGroupGetter_verifyError, (JSC::JSGlobalObject * globalObject, JSC::CallFrame* callFrame))
{
JSC::VM& vm = globalObject->vm();
auto scope = DECLARE_THROW_SCOPE(vm);
JSValue thisValue = callFrame->thisValue();
JSDiffieHellmanGroup* thisObject = jsDynamicCast<JSDiffieHellmanGroup*>(thisValue);
if (!thisObject) {
throwVMTypeError(globalObject, scope);
}
auto& dh = thisObject->getImpl();
auto result = dh.check();
if (result == ncrypto::DHPointer::CheckResult::CHECK_FAILED) {
return ERR::CRYPTO_OPERATION_FAILED(scope, globalObject, "Checking DH parameters failed"_s);
}
return JSValue::encode(JSC::jsNumber(static_cast<int>(result)));
}
} // namespace Bun

22
src/bun.js/bindings/node/crypto/JSDiffieHellmanPrototype.cpp
View File

@@ -19,7 +19,6 @@ JSC_DECLARE_HOST_FUNCTION(jsDiffieHellmanProtoFuncGetPublicKey);
JSC_DECLARE_HOST_FUNCTION(jsDiffieHellmanProtoFuncGetPrivateKey);
JSC_DECLARE_HOST_FUNCTION(jsDiffieHellmanProtoFuncSetPublicKey);
JSC_DECLARE_HOST_FUNCTION(jsDiffieHellmanProtoFuncSetPrivateKey);
JSC_DECLARE_CUSTOM_GETTER(jsDiffieHellmanGetter_verifyError);
const JSC::ClassInfo JSDiffieHellmanPrototype::s_info = { "DiffieHellman"_s, &Base::s_info, nullptr, nullptr, CREATE_METHOD_TABLE(JSDiffieHellmanPrototype) };
@@ -32,7 +31,6 @@ static const JSC::HashTableValue JSDiffieHellmanPrototypeTableValues[] = {
{ "getPrivateKey"_s, static_cast<unsigned>(JSC::PropertyAttribute::Function), JSC::NoIntrinsic, { JSC::HashTableValue::NativeFunctionType, jsDiffieHellmanProtoFuncGetPrivateKey, 0 } },
{ "setPublicKey"_s, static_cast<unsigned>(JSC::PropertyAttribute::Function), JSC::NoIntrinsic, { JSC::HashTableValue::NativeFunctionType, jsDiffieHellmanProtoFuncSetPublicKey, 1 } },
{ "setPrivateKey"_s, static_cast<unsigned>(JSC::PropertyAttribute::Function), JSC::NoIntrinsic, { JSC::HashTableValue::NativeFunctionType, jsDiffieHellmanProtoFuncSetPrivateKey, 1 } },
{ "verifyError"_s, static_cast<unsigned>(JSC::PropertyAttribute::ReadOnly | JSC::PropertyAttribute::CustomAccessor), JSC::NoIntrinsic, { JSC::HashTableValue::GetterSetterType, jsDiffieHellmanGetter_verifyError, 0 } },
};
void JSDiffieHellmanPrototype::finishCreation(JSC::VM& vm)
@@ -83,24 +81,4 @@ JSC_DEFINE_HOST_FUNCTION(jsDiffieHellmanProtoFuncSetPrivateKey, (JSC::JSGlobalOb
return jsDiffieHellmanProtoFuncSetPrivateKeyTemplate<JSDiffieHellman>(globalObject, callFrame);
}
JSC_DEFINE_CUSTOM_GETTER(jsDiffieHellmanGetter_verifyError, (JSC::JSGlobalObject * globalObject, JSC::EncodedJSValue thisValue, JSC::PropertyName))
{
JSC::VM& vm = globalObject->vm();
auto scope = DECLARE_THROW_SCOPE(vm);
auto* thisObject = JSC::jsDynamicCast<JSDiffieHellman*>(JSC::JSValue::decode(thisValue));
if (UNLIKELY(!thisObject)) {
throwThisTypeError(*globalObject, scope, "JSDiffieHellman"_s, "verifyError"_s);
return {};
}
auto& dh = thisObject->getImpl();
auto result = dh.check();
if (result == ncrypto::DHPointer::CheckResult::CHECK_FAILED) {
return Bun::ERR::CRYPTO_OPERATION_FAILED(scope, globalObject, "Checking DH parameters failed"_s);
}
return JSC::JSValue::encode(JSC::jsNumber(static_cast<int>(result)));
}
} // namespace Bun

16
test/js/node/crypto/node-crypto.test.js
View File

@@ -679,3 +679,19 @@ it("encoding should not throw in null, undefined or in valid encodings in create
expect(hmac.digest("hex")?.length).toBe(64);
}
});
it("verifyError should not be on the prototype of DiffieHellman and DiffieHellmanGroup", () => {
const dh = crypto.createDiffieHellman(512);
expect("verifyError" in crypto.DiffieHellman.prototype).toBeFalse();
expect("verifyError" in dh).toBeTrue();
expect(dh.verifyError).toBe(0);
const dhg = crypto.createDiffieHellmanGroup("modp5");
expect("verifyError" in crypto.DiffieHellmanGroup.prototype).toBeFalse();
expect("verifyError" in dhg).toBeTrue();
// boringssl seems to set DH_NOT_SUITABLE_GENERATOR for both
// DH_GENERATOR_2 and DH_GENERATOR_5 if not using
// DH_generate_parameters_ex
expect(dhg.verifyError).toBe(8);
});