GeezerVison

The World Wide Web, restored to 800 pixels of glory.

GeezerVison is showing github.com — crypto: remove default encoding from scrypt · nodejs/node@d799347

File tree

Expand file treeCollapse file tree

Open diff view settings

Filter options

lib/internal/crypto
- scrypt.js

Expand file treeCollapse file tree

Open diff view settings

Collapse file

`‎lib/internal/crypto/scrypt.js‎`

Copy file name to clipboardExpand all lines: lib/internal/crypto/scrypt.js

+2-8Lines changed: 2 additions & 8 deletions

Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,6 @@ const {`
`28`	`28`
`29`	`29`	`const {`
`30`	`30`	`getArrayBufferOrView,`
`31`		`- getDefaultEncoding,`
`32`	`31`	`} = require('internal/crypto/util');`
`33`	`32`
`34`	`33`	`const defaults = {`
`@@ -53,14 +52,11 @@ function scrypt(password, salt, keylen, options, callback = defaults) {`
`53`	`52`	`const job = new ScryptJob(`
`54`	`53`	`kCryptoJobAsync, password, salt, N, r, p, maxmem, keylen);`
`55`	`54`
`56`		`- const encoding = getDefaultEncoding();`
`57`	`55`	`job.ondone = (error, result) => {`
`58`	`56`	`if (error !== undefined)`
`59`	`57`	`return FunctionPrototypeCall(callback, job, error);`
`60`	`58`	`const buf = Buffer.from(result);`
`61`		`- if (encoding === 'buffer')`
`62`		`- return FunctionPrototypeCall(callback, job, null, buf);`
`63`		`- FunctionPrototypeCall(callback, job, null, buf.toString(encoding));`
	`59`	`+ return FunctionPrototypeCall(callback, job, null, buf);`
`64`	`60`	`};`
`65`	`61`
`66`	`62`	`job.run();`
`@@ -77,9 +73,7 @@ function scryptSync(password, salt, keylen, options = defaults) {`
`77`	`73`	`if (err !== undefined)`
`78`	`74`	`throw err;`
`79`	`75`
`80`		`- const buf = Buffer.from(result);`
`81`		`- const encoding = getDefaultEncoding();`
`82`		`- return encoding === 'buffer' ? buf : buf.toString(encoding);`
	`76`	`+ return Buffer.from(result);`
`83`	`77`	`}`
`84`	`78`
`85`	`79`	`function check(password, salt, keylen, options) {`

0 commit comments

Comments

0 (0)

You are visitor 01402503 — GeezerVison does not store the pages you look up.
Best viewed with Netscape Navigator 4.7 or Internet Explorer 6 at 800×600. No cookies required.