crypto: refactor keyObject.toCryptoKey() and SubtleCrypto.getPublicKey() · nodejs/node@824ec11 · GitHub

nodejs / node Public

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

• Code
• Issues 637
• Pull requests 761
• Actions
• Projects
• Security and quality
• Insights

Additional navigation options

Commit 824ec11

Browse filesBrowse the repository at this point in the historyBrowse files

panva

authored and

aduh95

committed

crypto: refactor keyObject.toCryptoKey() and SubtleCrypto.getPublicKey()

Move KeyObject.prototype.toCryptoKey() onto the base KeyObject class and dispatch from the cached native key type. Both secret and asymmetric conversions now pass a KeyObjectHandle through the Web Crypto import paths. Expose KeyObjectHandle.prototype.getKeyType() so asymmetric importers can validate public/private usages without wrapping the handle back into a KeyObject. Secret importers likewise consume KeyObjectHandle directly. Use the shared asymmetric conversion helper to derive public CryptoKeys for SubtleCrypto.getPublicKey(), avoiding the temporary PrivateKeyObject/createPublicKey round trip while keeping usage validation in the import path. Update getPublicKey and KeyObject.toCryptoKey tests to be driven from the Web Crypto supported-algorithm registry so new algorithms require either coverage or an explicit skip. Signed-off-by: Filip Skokan <panva.ip@gmail.com> PR-URL: #63622 Backport-PR-URL: #64629 Reviewed-By: Antoine du Hamel <duhamelantoine1995@gmail.com>

1 parent 73aba92 commit 824ec11
Copy full SHA for 824ec11

14 files changed

+630-392Lines changed: 630 additions & 392 deletions

File tree

Expand file treeCollapse file tree

Open diff view settings

Filter options

• lib/internal/crypto
  • aes.js
  • cfrg.js
  • chacha20_poly1305.js
  • ec.js
  • keys.js
  • mac.js
  • ml_dsa.js
  • ml_kem.js
  • rsa.js
  • webcrypto.js
• src/crypto
  • crypto_keys.cc
  • crypto_keys.h
• test/parallel
  • test-crypto-key-objects-to-crypto-key.js
  • test-webcrypto-get-public-key.mjs

Expand file treeCollapse file tree

Open diff view settings

Collapse file

‎lib/internal/crypto/aes.js‎

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

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

Original file line number	Diff line number	Diff line change
@@ -40,8 +40,6 @@ const {
40	40	InternalCryptoKey,
41	41	getCryptoKeyAlgorithm,
42	42	getCryptoKeyHandle,
43		- getKeyObjectHandle,
44		- getKeyObjectSymmetricKeySize,
45	43	} = require('internal/crypto/keys');
46	44
47	45	const {
@@ -223,10 +221,10 @@ function aesImportKey(
223	221	let handle;
224	222	let length;
225	223	switch (format) {
226		- case 'KeyObject': {
227		- length = getKeyObjectSymmetricKeySize(keyData) * 8;
	224	+ case 'KeyObjectHandle': {
	225	+ length = keyData.getSymmetricKeySize() * 8;
228	226	validateKeyLength(length);
229		- handle = getKeyObjectHandle(keyData);
	227	+ handle = keyData;
230	228	break;
231	229	}
232	230	case 'raw-secret':

Collapse file

‎lib/internal/crypto/cfrg.js‎

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

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

Original file line number	Diff line number	Diff line change
@@ -13,6 +13,7 @@ const {
13	13	kCryptoJobWebCrypto,
14	14	kKeyFormatDER,
15	15	kKeyFormatRawPublic,
	16	+ kKeyTypePublic,
16	17	kSignJobModeSign,
17	18	kSignJobModeVerify,
18	19	kWebCryptoKeyFormatPKCS8,
@@ -39,8 +40,6 @@ const {
39	40	const {
40	41	getCryptoKeyHandle,
41	42	getCryptoKeyType,
42		- getKeyObjectHandle,
43		- getKeyObjectType,
44	43	InternalCryptoKey,
45	44	} = require('internal/crypto/keys');
46	45
@@ -178,12 +177,11 @@ function cfrgImportKey(
178	177	let handle;
179	178	const usagesSet = new SafeSet(usages);
180	179	switch (format) {
181		- case 'KeyObject': {
	180	+ case 'KeyObjectHandle':
182	181	verifyAcceptableCfrgKeyUse(
183		- name, getKeyObjectType(keyData) === 'public', usagesSet);
184		- handle = getKeyObjectHandle(keyData);
	182	+ name, keyData.getKeyType() === kKeyTypePublic, usagesSet);
	183	+ handle = keyData;
185	184	break;
186		- }
187	185	case 'spki': {
188	186	verifyAcceptableCfrgKeyUse(name, true, usagesSet);
189	187	handle = importDerKey(keyData, true);

Collapse file

‎lib/internal/crypto/chacha20_poly1305.js‎

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

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

Original file line number	Diff line number	Diff line change
@@ -23,7 +23,6 @@ const {
23	23	const {
24	24	InternalCryptoKey,
25	25	getCryptoKeyHandle,
26		- getKeyObjectHandle,
27	26	} = require('internal/crypto/keys');
28	27
29	28	const {
@@ -90,8 +89,8 @@ function c20pImportKey(
90	89
91	90	let handle;
92	91	switch (format) {
93		- case 'KeyObject': {
94		- handle = getKeyObjectHandle(keyData);
	92	+ case 'KeyObjectHandle': {
	93	+ handle = keyData;
95	94	break;
96	95	}
97	96	case 'raw-secret': {

Collapse file

‎lib/internal/crypto/ec.js‎

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

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

Original file line number	Diff line number	Diff line change
@@ -46,8 +46,6 @@ const {
46	46	getCryptoKeyAlgorithm,
47	47	getCryptoKeyHandle,
48	48	getCryptoKeyType,
49		- getKeyObjectHandle,
50		- getKeyObjectType,
51	49	} = require('internal/crypto/keys');
52	50
53	51	const {
@@ -185,12 +183,11 @@ function ecImportKey(
185	183	let handle;
186	184	const usagesSet = new SafeSet(usages);
187	185	switch (format) {
188		- case 'KeyObject': {
	186	+ case 'KeyObjectHandle':
189	187	verifyAcceptableEcKeyUse(
190		- name, getKeyObjectType(keyData) === 'public', usagesSet);
191		- handle = getKeyObjectHandle(keyData);
	188	+ name, keyData.getKeyType() === kKeyTypePublic, usagesSet);
	189	+ handle = keyData;
192	190	break;
193		- }
194	191	case 'spki': {
195	192	verifyAcceptableEcKeyUse(name, true, usagesSet);
196	193	handle = importDerKey(keyData, true);

0 commit comments

Comments

0 (0)