Skip to content

crypto: harden bignum-to-binary conversions #24719

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

Closed
bnoordhuis wants to merge 1 commit into from
Closed

crypto: harden bignum-to-binary conversions #24719

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
crypto: harden bignum-to-binary conversions 
Refs: #24645
  • Loading branch information
@bnoordhuis
bnoordhuis committed Nov 29, 2018
commit 672ce0c5710ed479dd24773787471ea4675777db
20 changes: 10 additions & 10 deletions src/node_crypto.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4211,9 +4211,11 @@ void DiffieHellman::GenerateKeys(const FunctionCallbackInfo<Value>& args) {

const BIGNUM* pub_key;
DH_get0_key(diffieHellman->dh_.get(), &pub_key, nullptr);
size_t size = BN_num_bytes(pub_key);
const int size = BN_num_bytes(pub_key);
CHECK_GE(size, 0);
char* data = Malloc(size);
BN_bn2bin(pub_key, reinterpret_cast<unsigned char*>(data));
CHECK_EQ(size,
BN_bn2binpad(pub_key, reinterpret_cast<unsigned char*>(data), size));
args.GetReturnValue().Set(Buffer::New(env, data, size).ToLocalChecked());
}

Expand All @@ -4229,9 +4231,11 @@ void DiffieHellman::GetField(const FunctionCallbackInfo<Value>& args,
const BIGNUM* num = get_field(dh->dh_.get());
if (num == nullptr) return env->ThrowError(err_if_null);

size_t size = BN_num_bytes(num);
const int size = BN_num_bytes(num);
CHECK_GE(size, 0);
char* data = Malloc(size);
BN_bn2bin(num, reinterpret_cast<unsigned char*>(data));
CHECK_EQ(size,
BN_bn2binpad(num, reinterpret_cast<unsigned char*>(data), size));
args.GetReturnValue().Set(Buffer::New(env, data, size).ToLocalChecked());
}

Expand Down Expand Up @@ -4567,13 +4571,9 @@ void ECDH::GetPrivateKey(const FunctionCallbackInfo<Value>& args) {
if (b == nullptr)
return env->ThrowError("Failed to get ECDH private key");

int size = BN_num_bytes(b);
const int size = BN_num_bytes(b);
unsigned char* out = node::Malloc<unsigned char>(size);

if (size != BN_bn2bin(b, out)) {
free(out);
return env->ThrowError("Failed to convert ECDH private key to Buffer");
}
CHECK_EQ(size, BN_bn2binpad(b, out, size));

Local<Object> buf =
Buffer::New(env, reinterpret_cast<char*>(out), size).ToLocalChecked();
Expand Down