Skip to content

Commit 505b7f3

Browse files
committed
Use the default crypto Node.js package
1 parent fc319b8 commit 505b7f3

File tree

3 files changed

+15
-16
lines changed

3 files changed

+15
-16
lines changed

src/Query.js

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -394,14 +394,14 @@ var Query = (function () {
394394

395395
switch (func) {
396396
case 'sha1':
397-
var Sha = require('jssha');
398-
var shaObj = new Sha("SHA-1", "TEXT");
399-
shaObj.update(value);
400-
return shaObj.getHash("HEX");
397+
var shasum = require('crypto').createHash('sha1');
398+
shasum.update(value);
399+
return shasum.digest("HEX");
401400

402401
case 'md5':
403-
var md5 = require('md5');
404-
return md5(value);
402+
var md5 = require('crypto').createHash('md5');
403+
md5.update(value);
404+
return md5.digest("HEX");
405405

406406
case 'lowercase':
407407
return value.toLowerCase();

src/QueryParser.js

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -497,10 +497,9 @@ var QueryParser = (function () {
497497
if (params.length > 1) {
498498
throw new Error("JSONDB Query Parse Error: Too much parameters for the function sha1(), only one is required.");
499499
}
500-
var Sha = require('jssha');
501-
var shaObj = new Sha("SHA-1", "TEXT");
502-
shaObj.update(params[0]);
503-
return shaObj.getHash("HEX");
500+
var shasum = require('crypto').createHash('sha1');
501+
shasum.update(params[0]);
502+
return shasum.digest("HEX");
504503

505504
case 'md5':
506505
if (params === false) {
@@ -509,8 +508,9 @@ var QueryParser = (function () {
509508
if (params.length > 1) {
510509
throw new Error("JSONDB Query Parse Error: Too much parameters for the function md5(), only one is required.");
511510
}
512-
var md5 = require('md5');
513-
return md5(params[0]);
511+
var md5 = require('crypto').createHash('md5');
512+
md5.update(params[0]);
513+
return md5.digest("HEX");
514514

515515
case 'time':
516516
if (params !== false) {

src/Util.js

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,9 @@ var Util = (function () {
3737
* @return {string}
3838
*/
3939
Util.prototype.crypt = function (string) {
40-
var Sha = require('jssha');
41-
var shaObj = new Sha("SHA-1", "TEXT");
42-
shaObj.update(string + Util.cryptSalt);
43-
return shaObj.getHash("HEX");
40+
var shasum = require('crypto').createHash('sha1');
41+
shasum.update(string + Util.cryptSalt);
42+
return shasum.digest("HEX");
4443
};
4544

4645
/**

0 commit comments

Comments
 (0)