crypto: refactor keyObject.toCryptoKey() and SubtleCrypto.getPublicKey() by panva · Pull Request #63622 · nodejs/node · GitHub
Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nodejs-github-bot merged 1 commit into from
Jun 9, 2026
+630 −392
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 3 additions & 5 deletions lib/internal/crypto/aes.js
View file
Open in desktop
10 changes: 4 additions & 6 deletions lib/internal/crypto/cfrg.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ const {
kCryptoJobWebCrypto,
kKeyFormatDER,
kKeyFormatRawPublic,
kKeyTypePublic,
kSignJobModeSign,
kSignJobModeVerify,
kWebCryptoKeyFormatPKCS8,
Expand All @@ -37,8 +38,6 @@ const {
const {
getCryptoKeyHandle,
getCryptoKeyType,
getKeyObjectHandle,
getKeyObjectType,
InternalCryptoKey,
} = require('internal/crypto/keys');

Expand Down Expand Up @@ -176,12 +175,11 @@ function cfrgImportKey(
let handle;
const usagesSet = new SafeSet(usages);
switch (format) {
case 'KeyObject': {
case 'KeyObjectHandle':
verifyAcceptableCfrgKeyUse(
name, getKeyObjectType(keyData) === 'public', usagesSet);
handle = getKeyObjectHandle(keyData);
name, keyData.getKeyType() === kKeyTypePublic, usagesSet);
handle = keyData;
break;
}
case 'spki': {
verifyAcceptableCfrgKeyUse(name, true, usagesSet);
handle = importDerKey(keyData, true);
Expand Down
5 changes: 2 additions & 3 deletions lib/internal/crypto/chacha20_poly1305.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ const {
const {
InternalCryptoKey,
getCryptoKeyHandle,
getKeyObjectHandle,
} = require('internal/crypto/keys');

const {
Expand Down Expand Up @@ -90,8 +89,8 @@ function c20pImportKey(

let handle;
switch (format) {
case 'KeyObject': {
handle = getKeyObjectHandle(keyData);
case 'KeyObjectHandle': {
handle = keyData;
break;
}
case 'raw-secret': {
Expand Down
9 changes: 3 additions & 6 deletions lib/internal/crypto/ec.js
View file
Open in desktop
Loading
Loading