Skip to content

crypto: fix memory leak, reduce heap allocations, clean up #14122

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 18 commits into from
+266 −340
Closed

crypto: fix memory leak, reduce heap allocations, clean up #14122

Changes from 1 commit
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
a9d1431
src: remove extra heap allocations in CipherBase
bnoordhuis Jul 10, 2017
df1e3e8
src: remove unneeded const_cast
bnoordhuis Jul 10, 2017
87fc516
src: avoid heap allocation in sign.final()
bnoordhuis Jul 10, 2017
647370a
src: don't heap allocate GCM cipher auth tag
bnoordhuis Jul 10, 2017
f46e980
src: remove superfluous cipher_ data member
bnoordhuis Jul 10, 2017
5ae2cb8
src: remove unused Local
bnoordhuis Jul 10, 2017
dd6f4a9
src: make CipherBase::kind_ const
bnoordhuis Jul 10, 2017
d383042
src: remove extra heap allocation in GetSession()
bnoordhuis Jul 10, 2017
496ef4b
src: avoid heap allocation in hmac.digest()
bnoordhuis Jul 10, 2017
40807c1
src: remove extra heap allocations in DH functions
bnoordhuis Jul 10, 2017
5fd09df
src: refactor PBKDF2Request
bnoordhuis Jul 10, 2017
160b60f
src: make array arg length compile-time checkable
bnoordhuis Jul 10, 2017
3818792
src: avoid heap allocation in crypto.pbkdf2()
bnoordhuis Jul 10, 2017
0ce90a9
src: remove PBKDF2Request::release()
bnoordhuis Jul 10, 2017
1cfd02e
src: simplify PBKDF2Request
bnoordhuis Jul 10, 2017
b8e3a3e
src: guard against double free in randomBytes()
bnoordhuis Jul 10, 2017
083ccd2
src: reduce allocations in exportPublicKey()
bnoordhuis Jul 10, 2017
e4ac1b6
src: fix memory leak in DH key setters
bnoordhuis Jul 10, 2017
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
Prev Previous commit
Next Next commit
src: simplify PBKDF2Request 
This also renames a misnamed variable `error_` to `success_`.
  • Loading branch information
@bnoordhuis
bnoordhuis committed Jul 17, 2017
commit 1cfd02e146eb8cd7474261653b79feb462b8d106
65 changes: 10 additions & 55 deletions src/node_crypto.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5233,7 +5233,7 @@ class PBKDF2Request : public AsyncWrap {
int keylen)
: AsyncWrap(env, object, AsyncWrap::PROVIDER_PBKDF2REQUEST),
digest_(digest),
error_(0),
success_(false),
passlen_(passlen),
pass_(pass),
saltlen_(saltlen),
Expand Down Expand Up @@ -5265,46 +5265,6 @@ class PBKDF2Request : public AsyncWrap {
return &work_req_;
}

inline const EVP_MD* digest() const {
return digest_;
}

inline int passlen() const {
return passlen_;
}

inline char* pass() const {
return pass_;
}

inline int saltlen() const {
return saltlen_;
}

inline char* salt() const {
return salt_;
}

inline int keylen() const {
return keylen_;
}

inline char* key() const {
return key_;
}

inline int iter() const {
return iter_;
}

inline int error() const {
return error_;
}

inline void set_error(int err) {
error_ = err;
}

size_t self_size() const override { return sizeof(*this); }

static void Work(uv_work_t* work_req);
Expand All @@ -5317,7 +5277,7 @@ class PBKDF2Request : public AsyncWrap {
private:
uv_work_t work_req_;
const EVP_MD* digest_;
int error_;
bool success_;
int passlen_;
char* pass_;
int saltlen_;
Expand All @@ -5329,17 +5289,12 @@ class PBKDF2Request : public AsyncWrap {


void PBKDF2Request::Work() {
set_error(PKCS5_PBKDF2_HMAC(
pass(),
passlen(),
reinterpret_cast<unsigned char*>(salt()),
saltlen(),
iter(),
digest(),
keylen(),
reinterpret_cast<unsigned char*>(key())));
OPENSSL_cleanse(pass(), passlen());
OPENSSL_cleanse(salt(), saltlen());
success_ =
PKCS5_PBKDF2_HMAC(
pass_, passlen_, reinterpret_cast<unsigned char*>(salt_), saltlen_,
iter_, digest_, keylen_, reinterpret_cast<unsigned char*>(key_));
OPENSSL_cleanse(pass_, passlen_);
OPENSSL_cleanse(salt_, saltlen_);
}


Expand All @@ -5350,9 +5305,9 @@ void PBKDF2Request::Work(uv_work_t* work_req) {


void PBKDF2Request::After(Local<Value> (*argv)[2]) {
if (error()) {
if (success_) {
(*argv)[0] = Undefined(env()->isolate());
(*argv)[1] = Buffer::New(env(), key(), keylen()).ToLocalChecked();
(*argv)[1] = Buffer::New(env(), key_, keylen_).ToLocalChecked();
key_ = nullptr;
keylen_ = 0;
} else {
Expand Down