diff options
| author | James M Snell <jasnell@gmail.com> | 2020-10-26 21:25:42 +0300 |
|---|---|---|
| committer | Node.js GitHub Bot <github-bot@iojs.org> | 2020-10-30 14:08:09 +0300 |
| commit | 05bb1b3f9460f96a0241ecd2fada6d3abfdaf61d (patch) | |
| tree | c9e73e8b3bae0b6cba544fdf32a261108de81c7d /src/node_crypto.cc | |
| parent | 30e9fab8667746115f0076617469e866d564f053 (diff) | |
crypto: fixup scrypt regressions
Fixes a handful of regressions in scrypt support following
the refactor.
Fixes: https://github.com/nodejs/node/issues/35815
PR-URL: https://github.com/nodejs/node/pull/35821
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: Tobias Nießen <tniessen@tnie.de>
Reviewed-By: Matteo Collina <matteo.collina@gmail.com>
Reviewed-By: Rich Trott <rtrott@gmail.com>
Diffstat (limited to 'src/node_crypto.cc')
| -rw-r--r-- | src/node_crypto.cc | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/node_crypto.cc b/src/node_crypto.cc index 0c1dbcc52d7..d25387f1425 100644 --- a/src/node_crypto.cc +++ b/src/node_crypto.cc @@ -58,13 +58,16 @@ void Initialize(Local<Object> target, PBKDF2Job::Initialize(env, target); Random::Initialize(env, target); RSAAlg::Initialize(env, target); - ScryptJob::Initialize(env, target); SecureContext::Initialize(env, target); Sign::Initialize(env, target); SPKAC::Initialize(env, target); Timing::Initialize(env, target); Util::Initialize(env, target); Verify::Initialize(env, target); + +#ifndef OPENSSL_NO_SCRYPT + ScryptJob::Initialize(env, target); +#endif } } // namespace crypto |