Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
24 changes: 5 additions & 19 deletions lib/internal/crypto/cfrg.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ const {
kCryptoJobWebCrypto,
kKeyFormatDER,
kKeyFormatRawPublic,
kKeyTypePublic,
kSignJobModeSign,
kSignJobModeVerify,
kWebCryptoKeyFormatPKCS8,
Expand Down Expand Up @@ -39,7 +38,7 @@ const {
const {
createKeyUsages,
getKeyPairUsages,
importDerKey,
importAsymmetricKeyHandle,
importJwkKey,
importRawKey,
validateJwk,
Expand Down Expand Up @@ -117,24 +116,11 @@ function cfrgImportKey(
const usagesSet = toUsagesSet(usages);
switch (format) {
case 'KeyObjectHandle':
verifyAcceptableKeyUse(
name,
usagesSet,
keyData.getKeyType() === kKeyTypePublic ?
allowedUsages.public :
allowedUsages.private);
handle = keyData;
break;
case 'spki': {
verifyAcceptableKeyUse(name, usagesSet, allowedUsages.public);
handle = importDerKey(keyData, true);
break;
}
case 'pkcs8': {
verifyAcceptableKeyUse(name, usagesSet, allowedUsages.private);
handle = importDerKey(keyData, false);
case 'spki':
case 'pkcs8':
handle = importAsymmetricKeyHandle(
format, keyData, name, usagesSet, allowedUsages);
break;
}
case 'jwk': {
const isPublic = keyData.d === undefined;
verifyAcceptableKeyUse(
Expand Down
23 changes: 5 additions & 18 deletions lib/internal/crypto/ec.js
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ const {
const {
createKeyUsages,
getKeyPairUsages,
importDerKey,
importAsymmetricKeyHandle,
importJwkKey,
importRawKey,
validateJwk,
Expand Down Expand Up @@ -148,24 +148,11 @@ function ecImportKey(
const usagesSet = toUsagesSet(usages);
switch (format) {
case 'KeyObjectHandle':
verifyAcceptableKeyUse(
name,
usagesSet,
keyData.getKeyType() === kKeyTypePublic ?
allowedUsages.public :
allowedUsages.private);
handle = keyData;
break;
case 'spki': {
verifyAcceptableKeyUse(name, usagesSet, allowedUsages.public);
handle = importDerKey(keyData, true);
break;
}
case 'pkcs8': {
verifyAcceptableKeyUse(name, usagesSet, allowedUsages.private);
handle = importDerKey(keyData, false);
case 'spki':
case 'pkcs8':
handle = importAsymmetricKeyHandle(
format, keyData, name, usagesSet, allowedUsages);
break;
}
case 'jwk': {
const isPublic = keyData.d === undefined;
verifyAcceptableKeyUse(
Expand Down
53 changes: 21 additions & 32 deletions lib/internal/crypto/ml_dsa.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ const {
kKeyFormatDER,
kKeyFormatRawPublic,
kKeyFormatRawSeed,
kKeyTypePublic,
kSignJobModeSign,
kSignJobModeVerify,
kWebCryptoKeyFormatRaw,
Expand Down Expand Up @@ -42,7 +41,7 @@ const {
const {
createKeyUsages,
getKeyPairUsages,
importDerKey,
importAsymmetricKeyHandle,
importJwkKey,
importRawKey,
validateJwk,
Expand Down Expand Up @@ -105,6 +104,21 @@ function mlDsaExportKey(key, format) {
}
}

const kPrivOnlyPkcs8Lengths = {
'__proto__': null,
'ML-DSA-44': 2588,
'ML-DSA-65': 4060,
'ML-DSA-87': 4924,
};

function rejectPkcs8WithoutSeed(keyData, name) {
if (getBufferSourceByteLength(keyData) === kPrivOnlyPkcs8Lengths[name]) {
throw lazyDOMException(
'Importing an ML-DSA PKCS#8 key without a seed is not supported',
'NotSupportedError');
}
}

function mlDsaImportKey(
format,
keyData,
Expand All @@ -117,37 +131,12 @@ function mlDsaImportKey(
const usagesSet = toUsagesSet(usages);
switch (format) {
case 'KeyObjectHandle':
verifyAcceptableKeyUse(
name,
usagesSet,
keyData.getKeyType() === kKeyTypePublic ?
kUsages.public :
kUsages.private);
handle = keyData;
break;
case 'spki': {
verifyAcceptableKeyUse(name, usagesSet, kUsages.public);
handle = importDerKey(keyData, true);
break;
}
case 'pkcs8': {
verifyAcceptableKeyUse(name, usagesSet, kUsages.private);

const privOnlyLengths = {
'__proto__': null,
'ML-DSA-44': 2588,
'ML-DSA-65': 4060,
'ML-DSA-87': 4924,
};
if (getBufferSourceByteLength(keyData) === privOnlyLengths[name]) {
throw lazyDOMException(
'Importing an ML-DSA PKCS#8 key without a seed is not supported',
'NotSupportedError');
}

handle = importDerKey(keyData, false);
case 'spki':
case 'pkcs8':
handle = importAsymmetricKeyHandle(
format, keyData, name, usagesSet, kUsages,
(data) => rejectPkcs8WithoutSeed(data, name));
break;
}
case 'jwk': {
const isPublic = keyData.priv === undefined;
verifyAcceptableKeyUse(
Expand Down
53 changes: 21 additions & 32 deletions lib/internal/crypto/ml_kem.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ const {
kKeyFormatDER,
kKeyFormatRawPublic,
kKeyFormatRawSeed,
kKeyTypePublic,
kWebCryptoKeyFormatPKCS8,
kWebCryptoKeyFormatRaw,
kWebCryptoKeyFormatSPKI,
Expand All @@ -40,7 +39,7 @@ const {
const {
createKeyUsages,
getKeyPairUsages,
importDerKey,
importAsymmetricKeyHandle,
importJwkKey,
importRawKey,
validateJwk,
Expand Down Expand Up @@ -105,6 +104,21 @@ function mlKemExportKey(key, format) {
}
}

const kPrivOnlyPkcs8Lengths = {
'__proto__': null,
'ML-KEM-512': 1660,
'ML-KEM-768': 2428,
'ML-KEM-1024': 3196,
};

function rejectPkcs8WithoutSeed(keyData, name) {
if (getBufferSourceByteLength(keyData) === kPrivOnlyPkcs8Lengths[name]) {
throw lazyDOMException(
'Importing an ML-KEM PKCS#8 key without a seed is not supported',
'NotSupportedError');
}
}

function mlKemImportKey(
format,
keyData,
Expand All @@ -117,37 +131,12 @@ function mlKemImportKey(
const usagesSet = toUsagesSet(usages);
switch (format) {
case 'KeyObjectHandle':
verifyAcceptableKeyUse(
name,
usagesSet,
keyData.getKeyType() === kKeyTypePublic ?
kUsages.public :
kUsages.private);
handle = keyData;
break;
case 'spki': {
verifyAcceptableKeyUse(name, usagesSet, kUsages.public);
handle = importDerKey(keyData, true);
break;
}
case 'pkcs8': {
verifyAcceptableKeyUse(name, usagesSet, kUsages.private);

const privOnlyLengths = {
'__proto__': null,
'ML-KEM-512': 1660,
'ML-KEM-768': 2428,
'ML-KEM-1024': 3196,
};
if (getBufferSourceByteLength(keyData) === privOnlyLengths[name]) {
throw lazyDOMException(
'Importing an ML-KEM PKCS#8 key without a seed is not supported',
'NotSupportedError');
}

handle = importDerKey(keyData, false);
case 'spki':
case 'pkcs8':
handle = importAsymmetricKeyHandle(
format, keyData, name, usagesSet, kUsages,
(data) => rejectPkcs8WithoutSeed(data, name));
break;
}
case 'raw-public':
case 'raw-seed': {
const isPublic = format === 'raw-public';
Expand Down
26 changes: 5 additions & 21 deletions lib/internal/crypto/rsa.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ const {
SignJob,
kCryptoJobWebCrypto,
kKeyFormatDER,
kKeyTypePublic,
kSignJobModeSign,
kSignJobModeVerify,
kKeyVariantRSA_OAEP,
Expand Down Expand Up @@ -53,7 +52,7 @@ const {
const {
createKeyUsages,
getKeyPairUsages,
importDerKey,
importAsymmetricKeyHandle,
importJwkKey,
validateJwk,
validateKeyUsages,
Expand Down Expand Up @@ -182,26 +181,11 @@ function rsaImportKey(
let handle;
switch (format) {
case 'KeyObjectHandle':
verifyAcceptableKeyUse(
algorithm.name,
usagesSet,
keyData.getKeyType() === kKeyTypePublic ?
allowedUsages.public :
allowedUsages.private);
handle = keyData;
break;
case 'spki': {
verifyAcceptableKeyUse(
algorithm.name, usagesSet, allowedUsages.public);
handle = importDerKey(keyData, true);
case 'spki':
case 'pkcs8':
handle = importAsymmetricKeyHandle(
format, keyData, algorithm.name, usagesSet, allowedUsages);
break;
}
case 'pkcs8': {
verifyAcceptableKeyUse(
algorithm.name, usagesSet, allowedUsages.private);
handle = importDerKey(keyData, false);
break;
}
case 'jwk': {
const isPublic = keyData.d === undefined;
verifyAcceptableKeyUse(
Expand Down
Loading
Loading