summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Mehren2021-04-26 21:30:06 +0200
committerGitHub2021-04-26 21:30:06 +0200
commit7ea3357ba846127b6e3d63fa0722de9be2957a7f (patch)
tree81130c2bd702b5bd3dd2834c9a157b43779c6488
parent09466189ad0d4020059ec56486d05dcb135fd7e1 (diff)
parent0a1bf3ca1dd8c6558a13d27b389e7e96359a01b9 (diff)
Merge pull request #1201 from hedgedoc/remove-polyfill
-rw-r--r--lib/models/user.js9
-rw-r--r--package.json1
-rw-r--r--yarn.lock5
3 files changed, 0 insertions, 15 deletions
diff --git a/lib/models/user.js b/lib/models/user.js
index 26a557a7..383be1a7 100644
--- a/lib/models/user.js
+++ b/lib/models/user.js
@@ -1,15 +1,6 @@
'use strict'
// external modules
const Sequelize = require('sequelize')
-const crypto = require('crypto')
-if (!crypto.scrypt) {
- // polyfill for node.js 8.0, see https://github.com/chrisveness/scrypt-kdf#openssl-implementation
- const scryptAsync = require('scrypt-async')
- crypto.scrypt = function (password, salt, keylen, options, callback) {
- const opt = Object.assign({}, options, { dkLen: keylen })
- scryptAsync(password, salt, opt, (derivedKey) => callback(null, Buffer.from(derivedKey)))
- }
-}
const scrypt = require('scrypt-kdf')
// core
diff --git a/package.json b/package.json
index 3fe38654..8496ad13 100644
--- a/package.json
+++ b/package.json
@@ -115,7 +115,6 @@
"readline-sync": "^1.4.7",
"reveal.js": "^3.9.2",
"rimraf": "^3.0.2",
- "scrypt-async": "^2.0.1",
"scrypt-kdf": "^2.0.1",
"select2": "^3.5.2-browserify",
"sequelize": "^5.21.1",
diff --git a/yarn.lock b/yarn.lock
index 6f6a95c7..3447585b 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -9451,11 +9451,6 @@ script-loader@0.7.2:
dependencies:
raw-loader "~0.5.1"
-scrypt-async@^2.0.1:
- version "2.0.1"
- resolved "https://registry.yarnpkg.com/scrypt-async/-/scrypt-async-2.0.1.tgz#4318dae48a8b7cc3b8fe05f75f4164a7d973d25d"
- integrity sha512-wHR032jldwZNy7Tzrfu7RccOgGf8r5hyDMSP2uV6DpLiBUsR8JsDcx/in73o2UGVVrH5ivRFdNsFPcjtl3LErQ==
-
scrypt-kdf@^2.0.1:
version "2.0.1"
resolved "https://registry.yarnpkg.com/scrypt-kdf/-/scrypt-kdf-2.0.1.tgz#3355224c52d398331b2cbf2b70a7be26b52c53e6"