summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristoph (Sheogorath) Kern2018-11-21 01:42:19 +0100
committerGitHub2018-11-21 01:42:19 +0100
commit26b617b032d00df4bfbed343f576f14e564f0001 (patch)
tree0167ac2cfefaafc530ccc04857f58125ccc283e4
parent234171e117842a69aed1a79c55307c2f6dd2043d (diff)
parentcee2aa92f9244d1dcfc65c5553f5d7f0bbfb3871 (diff)
Merge pull request #1066 from SISheogorath/update/scrypt
Switch scrypt library to a successor
-rw-r--r--lib/models/user.js2
-rw-r--r--package.json2
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/models/user.js b/lib/models/user.js
index 2ebf6d06..648db73e 100644
--- a/lib/models/user.js
+++ b/lib/models/user.js
@@ -1,7 +1,7 @@
'use strict'
// external modules
var Sequelize = require('sequelize')
-var scrypt = require('scrypt')
+var scrypt = require('@mlink/scrypt')
// core
var logger = require('../logger')
diff --git a/package.json b/package.json
index 9779108f..2edd1af5 100644
--- a/package.json
+++ b/package.json
@@ -111,7 +111,7 @@
"readline-sync": "^1.4.7",
"request": "^2.88.0",
"reveal.js": "~3.7.0",
- "scrypt": "^6.0.3",
+ "@mlink/scrypt": "^6.1.2",
"select2": "^3.5.2-browserify",
"sequelize": "^3.28.0",
"sequelize-cli": "^2.5.1",