crypto: forbid NODE-ED25519 and NODE-ED448 "raw" key export · nodejs/node@36bb8da · GitHub

nodejs / node Public

• Notifications You must be signed in to change notification settings
• Fork 36.6k
• Star 120k

• Code
• Issues 635
• Pull requests 754
• Actions
• Projects
• Security and quality
• Insights

Additional navigation options

Commit 36bb8da

Browse filesBrowse the repository at this point in the historyBrowse files

panva

authored and

targos

committed

crypto: forbid NODE-ED25519 and NODE-ED448 "raw" key export

closes #38655 PR-URL: #38668 Reviewed-By: Gus Caplan <me@gus.host> Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Rich Trott <rtrott@gmail.com>

1 parent a028805 commit 36bb8da
Copy full SHA for 36bb8da

2 files changed

+11-11Lines changed: 11 additions & 11 deletions

File tree

Expand file treeCollapse file tree

Open diff view settings

Filter options

• lib/internal/crypto
  • webcrypto.js
• test/parallel
  • test-webcrypto-ed25519-ed448.js

Expand file treeCollapse file tree

Open diff view settings

Collapse file

‎lib/internal/crypto/webcrypto.js‎

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

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

Original file line number	Diff line number	Diff line change
@@ -288,8 +288,11 @@ async function exportKeyRaw(key) {
288	288	case 'NODE-ED25519':
289	289	// Fall through
290	290	case 'NODE-ED448':
291		- return lazyRequire('internal/crypto/ec')
292		- .ecExportKey(key, kWebCryptoKeyFormatRaw);
	291	+ if (key.type === 'public') {
	292	+ return lazyRequire('internal/crypto/ec')
	293	+ .ecExportKey(key, kWebCryptoKeyFormatRaw);
	294	+ }
	295	+ break;
293	296	case 'ECDSA':
294	297	// Fall through
295	298	case 'ECDH':

Collapse file

‎test/parallel/test-webcrypto-ed25519-ed448.js‎

Copy file name to clipboardExpand all lines: test/parallel/test-webcrypto-ed25519-ed448.js

+6-9Lines changed: 6 additions & 9 deletions

Original file line number	Diff line number	Diff line change
@@ -268,15 +268,12 @@ async function test2(namedCurve) {
268	268	true, ['verify']),
269	269	]);
270	270
271		- const [
272		- rawKey1,
273		- rawKey2,
274		- ] = await Promise.all([
275		- subtle.exportKey('raw', privateKey),
276		- subtle.exportKey('raw', publicKey),
277		- ]);
278		- assert.deepStrictEqual(Buffer.from(rawKey1), vector.privateKey);
279		- assert.deepStrictEqual(Buffer.from(rawKey2), vector.publicKey);
	271	+ const rawPublicKey = await subtle.exportKey('raw', publicKey);
	272	+ assert.deepStrictEqual(Buffer.from(rawPublicKey), vector.publicKey);
	273	+
	274	+ assert.rejects(subtle.exportKey('raw', privateKey), {
	275	+ message: new RegExp(`Unable to export a raw ${namedCurve} private key`)
	276	+ }).then(common.mustCall());
280	277
281	278	const sig = await subtle.sign(
282	279	{ name: namedCurve },

0 commit comments

Comments

0 (0)