GeezerVison

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

GeezerVison is showing github.com — crypto: reject unintended raw key format string input · nodejs/node@341947e

File tree

Expand file treeCollapse file tree

Open diff view settings

Filter options

lib/internal/crypto
- keys.js
test/parallel
- test-crypto-key-objects-raw.js

Expand file treeCollapse file tree

Open diff view settings

Collapse file

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

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

+1-1Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -765,7 +765,7 @@ function getKeyObjectHandleFromJwk(key, ctx) {`
`765`	`765`
`766`	`766`
`767`	`767`	`function getKeyObjectHandleFromRaw(options, data, format) {`
`768`		`- if (!isStringOrBuffer(data)) {`
	`768`	`+ if (!isArrayBufferView(data) && !isAnyArrayBuffer(data)) {`
`769`	`769`	`throw new ERR_INVALID_ARG_TYPE(`
`770`	`770`	`'key.key',`
`771`	`771`	`['ArrayBuffer', 'Buffer', 'TypedArray', 'DataView'],`

Collapse file

`‎test/parallel/test-crypto-key-objects-raw.js‎`

Copy file name to clipboardExpand all lines: test/parallel/test-crypto-key-objects-raw.js

+44Lines changed: 44 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -32,6 +32,50 @@ const { hasOpenSSL } = require('../common/crypto');`
`32`	`32`	`}`
`33`	`33`	`}`
`34`	`34`
	`35`	`+// Raw key imports do not support strings.`
	`36`	`+{`
	`37`	`+ const pubKeyObj = crypto.createPublicKey(`
	`38`	`+ fixtures.readKey('ed25519_public.pem', 'ascii'));`
	`39`	`+ const privKeyObj = crypto.createPrivateKey(`
	`40`	`+ fixtures.readKey('ed25519_private.pem', 'ascii'));`
	`41`	`+`
	`42`	`+ const rawPub = pubKeyObj.export({ format: 'raw-public' });`
	`43`	`+ const rawPriv = privKeyObj.export({ format: 'raw-private' });`
	`44`	`+`
	`45`	`+ for (const encoding of ['hex', 'base64', 'utf8', 'latin1', 'ascii']) {`
	`46`	`+ assert.throws(() => crypto.createPublicKey({`
	`47`	`+ key: rawPub.toString(encoding),`
	`48`	`+ encoding,`
	`49`	`+ format: 'raw-public',`
	`50`	`+ asymmetricKeyType: 'ed25519',`
	`51`	`+ }), { code: 'ERR_INVALID_ARG_TYPE' });`
	`52`	`+`
	`53`	`+ assert.throws(() => crypto.createPrivateKey({`
	`54`	`+ key: rawPriv.toString(encoding),`
	`55`	`+ encoding,`
	`56`	`+ format: 'raw-private',`
	`57`	`+ asymmetricKeyType: 'ed25519',`
	`58`	`+ }), { code: 'ERR_INVALID_ARG_TYPE' });`
	`59`	`+ }`
	`60`	`+}`
	`61`	`+`
	`62`	`+// Raw seed imports do not support strings.`
	`63`	`+if (hasOpenSSL(3, 5)) {`
	`64`	`+ const privKeyObj = crypto.createPrivateKey(`
	`65`	`+ fixtures.readKey('ml_dsa_44_private.pem', 'ascii'));`
	`66`	`+`
	`67`	`+ const rawSeed = privKeyObj.export({ format: 'raw-seed' });`
	`68`	`+`
	`69`	`+ for (const encoding of ['hex', 'base64']) {`
	`70`	`+ assert.throws(() => crypto.createPrivateKey({`
	`71`	`+ key: rawSeed.toString(encoding),`
	`72`	`+ encoding,`
	`73`	`+ format: 'raw-seed',`
	`74`	`+ asymmetricKeyType: 'ml-dsa-44',`
	`75`	`+ }), { code: 'ERR_INVALID_ARG_TYPE' });`
	`76`	`+ }`
	`77`	`+}`
	`78`	`+`
`35`	`79`	`// Key types that don't support raw-* formats`
`36`	`80`	`{`
`37`	`81`	`for (const [type, pub, priv] of [`

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.