Merged
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
4 changes: 4 additions & 0 deletions lib/internal/crypto/mac.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -20,6 +20,7 @@ const {
normalizeHashName,
numBitsToBytes,
truncateToBitLength,
validateKmacKeyLength,
} = require('internal/crypto/util');

const {
Expand DownExpand Up@@ -60,6 +61,9 @@ function normalizeKeyLength(handle, algorithm) {
length = algorithm.length;
}

if (algorithm.name === 'KMAC128' || algorithm.name === 'KMAC256')
validateKmacKeyLength(length);

return { handle, length };
}

Expand Down
14 changes: 14 additions & 0 deletions lib/internal/crypto/util.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -47,9 +47,12 @@ const {
EVP_PKEY_ML_KEM_1024,
kKeyVariantAES_OCB_128: hasAesOcbMode,
Argon2Job,
getFipsCrypto,
KmacJob,
} = internalBinding('crypto');

const isFips = getFipsCrypto() === 1;

const { getOptionValue } = require('internal/options');

const {
Expand DownExpand Up@@ -423,6 +426,8 @@ const conditionalAlgorithms = {
'Ed448': !process.features.openssl_is_boringssl,
'KMAC128': !!KmacJob,
'KMAC256': !!KmacJob,
'KT128': !isFips,
'KT256': !isFips,
'ML-DSA-44': !!EVP_PKEY_ML_DSA_44,
'ML-DSA-65': !!EVP_PKEY_ML_DSA_65,
'ML-DSA-87': !!EVP_PKEY_ML_DSA_87,
Expand All@@ -435,6 +440,8 @@ const conditionalAlgorithms = {
ArrayPrototypeIncludes(getHashes(), 'sha3-384'),
'SHA3-512': !process.features.openssl_is_boringssl ||
ArrayPrototypeIncludes(getHashes(), 'sha3-512'),
'TurboSHAKE128': !isFips,
'TurboSHAKE256': !isFips,
'X448': !process.features.openssl_is_boringssl,
};

Expand DownExpand Up@@ -579,6 +586,11 @@ function validateMaxBufferLength(data, name, max = kMaxBufferLength) {
}
}

function validateKmacKeyLength(length) {
if ((length < 32 || length % 8) && isFips)
throw lazyDOMException('Invalid key length', 'NotSupportedError');
}

/**
* Converts a bit length to the number of bytes needed to contain it.
* Non-byte lengths are rounded up to the next byte.
Expand DownExpand Up@@ -1097,6 +1109,7 @@ module.exports = {

kNamedCurveAliases,
kSupportedAlgorithms,
isFips,
normalizeAlgorithm,
normalizeHashName,
hasAnyNotIn,
Expand All@@ -1106,6 +1119,7 @@ module.exports = {
jobPromiseThen,
cleanupWebCryptoResult,
prepareWebCryptoResult,
validateKmacKeyLength,
validateMaxBufferLength,
numBitsToBytes,
truncateToBitLength,
Expand Down
51 changes: 34 additions & 17 deletions lib/internal/crypto/webidl.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,7 +9,6 @@ const {
StringPrototypeSplit,
StringPrototypeStartsWith,
StringPrototypeToLowerCase,
TypedArrayPrototypeGetLength,
} = primordials;

const {
Expand All@@ -27,8 +26,10 @@ const {
validateMaxBufferLength,
getBufferSourceByteLength,
getBufferSourceBytes,
isFips,
kNamedCurveAliases,
numBitsToBytes,
validateKmacKeyLength,
} = require('internal/crypto/util');
const {
converters: webidl,
Expand DownExpand Up@@ -252,30 +253,39 @@ function validateCShakeOutputLength(V) {
}
}

function bufferSourceEqualsAscii(V, string) {
if (getBufferSourceByteLength(V) !== string.length) return false;

const bytes = getBufferSourceBytes(V);
const length = TypedArrayPrototypeGetLength(bytes);
for (let i = 0; i < length; i++) {
if (bytes[i] !== StringPrototypeCharCodeAt(string, i)) return false;
}
return true;
}
const kCShakeFunctionNames = ['KMAC', 'TupleHash', 'ParallelHash'];

function validateCShakeFunctionName(V) {
if (getBufferSourceByteLength(V) === 0 ||
bufferSourceEqualsAscii(V, 'KMAC') ||
bufferSourceEqualsAscii(V, 'TupleHash') ||
bufferSourceEqualsAscii(V, 'ParallelHash')) {
return;
const length = getBufferSourceByteLength(V);
if (length === 0) return;

if (!isFips) {
const bytes = getBufferSourceBytes(V);
for (let i = 0; i < kCShakeFunctionNames.length; i++) {
const functionName = kCShakeFunctionNames[i];
if (length !== functionName.length) continue;

let j = 0;
for (; j < length; j++) {
if (bytes[j] !== StringPrototypeCharCodeAt(functionName, j)) break;
}
if (j === length) return;
}
}

throw lazyDOMException(
'Unsupported CShakeParams functionName',
'NotSupportedError');
}

function validateCShakeCustomization(V) {
if (isFips && getBufferSourceByteLength(V) !== 0)
throw lazyDOMException(
'Unsupported CShakeParams customization',
'NotSupportedError');
validateMaxBufferLength(V, 'CShakeParams.customization', 512);
}

converters.RsaPssParams = createDictionaryConverter(
'RsaPssParams', [
dictAlgorithm,
Expand DownExpand Up@@ -433,7 +443,7 @@ converters.CShakeParams = createDictionaryConverter(
{
key: 'customization',
converter: converters.BufferSource,
validator: (V, opts) => validateMaxBufferLength(V, 'CShakeParams.customization', 512),
validator: validateCShakeCustomization,
},
],
]);
Expand DownExpand Up@@ -719,6 +729,7 @@ for (let i = 0; i < kKmacDictionaries.length; i++) {
key: 'length',
converter: (V, opts) =>
converters['unsigned long'](V, enforceRangeOptions(opts)),
validator: validateKmacKeyLength,
},
],
]);
Expand All@@ -732,6 +743,12 @@ converters.KmacParams = createDictionaryConverter(
key: 'outputLength',
converter: (V, opts) =>
converters['unsigned long'](V, enforceRangeOptions(opts)),
validator: (V) => {
if ((V === 0 || V % 8) && isFips)
throw lazyDOMException(
'Invalid KmacParams outputLength',
'NotSupportedError');
},
required: true,
},
{
Expand Down
5 changes: 5 additions & 0 deletions src/crypto/crypto_hash.cc
Original file line numberDiff line numberDiff line change
Expand Up@@ -827,6 +827,11 @@ Maybe<void> CShakeTraits::AdditionalConfig(
CShakeConfig* params) {
Environment* env = Environment::GetCurrent(args);

if (IsFipsEnabled()) {
THROW_ERR_CRYPTO_UNSUPPORTED_OPERATION(env);
return Nothing<void>();
}

CHECK(args[offset]->IsString()); // Algorithm name
Utf8Value algorithm_name(env->isolate(), args[offset]);
std::string_view algorithm_str = algorithm_name.ToStringView();
Expand Down
2 changes: 2 additions & 0 deletions src/crypto/crypto_kmac.cc
Original file line numberDiff line numberDiff line change
Expand Up@@ -151,6 +151,8 @@ bool DeriveBitsWithCShake(const KmacConfig& params,
const void* key_data,
size_t key_size,
ByteSource* out) {
if (IsFipsEnabled()) return false;

const size_t key_length_bytes = NumBitsToBytes(params.key_length);
if (key_size < key_length_bytes) return false;

Expand Down
10 changes: 10 additions & 0 deletions src/crypto/crypto_turboshake.cc
Original file line numberDiff line numberDiff line change
Expand Up@@ -428,6 +428,11 @@ Maybe<void> TurboShakeTraits::AdditionalConfig(
TurboShakeConfig* params) {
Environment* env = Environment::GetCurrent(args);

if (IsFipsEnabled()) {
THROW_ERR_CRYPTO_UNSUPPORTED_OPERATION(env);
return Nothing<void>();
}

// args[offset + 0] = algorithm name (string)
CHECK(args[offset]->IsString());
Utf8Value algorithm_name(env->isolate(), args[offset]);
Expand DownExpand Up@@ -535,6 +540,11 @@ Maybe<void> KangarooTwelveTraits::AdditionalConfig(
KangarooTwelveConfig* params) {
Environment* env = Environment::GetCurrent(args);

if (IsFipsEnabled()) {
THROW_ERR_CRYPTO_UNSUPPORTED_OPERATION(env);
return Nothing<void>();
}

// args[offset + 0] = algorithm name (string)
CHECK(args[offset]->IsString());
Utf8Value algorithm_name(env->isolate(), args[offset]);
Expand Down
8 changes: 6 additions & 2 deletions src/crypto/crypto_util.cc
Original file line numberDiff line numberDiff line change
Expand Up@@ -146,6 +146,11 @@ bool InitCryptoOnce(Isolate* isolate) {
// be part of a larger mutex for global OpenSSL state.
static Mutex fips_mutex;

bool IsFipsEnabled() {
Mutex::ScopedLock fips_lock(fips_mutex);
return ncrypto::isFipsEnabled();
}

void InitCryptoOnce() {
Mutex::ScopedLock lock(per_process::cli_options_mutex);
Mutex::ScopedLock fips_lock(fips_mutex);
Expand DownExpand Up@@ -223,8 +228,7 @@ void InitCryptoOnce() {

void GetFipsCrypto(const FunctionCallbackInfo<Value>& args) {
Mutex::ScopedLock lock(per_process::cli_options_mutex);
Mutex::ScopedLock fips_lock(fips_mutex);
args.GetReturnValue().Set(ncrypto::isFipsEnabled() ? 1 : 0);
args.GetReturnValue().Set(IsFipsEnabled() ? 1 : 0);
}

void SetFipsCrypto(const FunctionCallbackInfo<Value>& args) {
Expand Down
1 change: 1 addition & 0 deletions src/crypto/crypto_util.h
Original file line numberDiff line numberDiff line change
Expand Up@@ -66,6 +66,7 @@ constexpr T NumBitsToBytes(T bits) {
// what went wrong, or std::nullopt when there was nothing to do or the
// options were applied successfully.
std::optional<std::string> ProcessFipsOptions();
bool IsFipsEnabled();

bool InitCryptoOnce(v8::Isolate* isolate);
void InitCryptoOnce();
Expand Down
28 changes: 21 additions & 7 deletions test/parallel/test-crypto-key-objects-to-crypto-key.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -14,6 +14,7 @@ const {
} = require('crypto');
const { hasFIPS } = require('../common/crypto');
const { kSupportedAlgorithms } = require('internal/crypto/util');
const fips = hasFIPS();
const rejectsXCurves = hasFIPS(3, 5);

const hashes = Object.keys(kSupportedAlgorithms.digest).filter((name) => {
Expand DownExpand Up@@ -142,14 +143,24 @@ function macInvalid(algorithm, invalidLengthMessage, allowZeroKey = false) {
const key = createSecretKey(randomBytes(32));
const usages = ['sign', 'verify'];

if (allowZeroKey) {
if (allowZeroKey && !fips) {
const zeroKey = createSecretKey(Buffer.alloc(0))
.toCryptoKey(algorithm, true, usages);
assert.strictEqual(zeroKey.algorithm.length, 0);

const explicitZeroKey = createSecretKey(Buffer.alloc(0))
.toCryptoKey({ ...algorithm, length: 0 }, true, usages);
assert.strictEqual(explicitZeroKey.algorithm.length, 0);
} else if (allowZeroKey) {
for (const zeroAlgorithm of [algorithm, { ...algorithm, length: 0 }]) {
assert.throws(() => {
createSecretKey(Buffer.alloc(0))
.toCryptoKey(zeroAlgorithm, true, usages);
}, {
name: 'NotSupportedError',
message: 'Invalid key length',
});
}
} else {
assert.throws(() => {
createSecretKey(Buffer.alloc(0)).toCryptoKey(algorithm, true, usages);
Expand All@@ -164,12 +175,15 @@ function macInvalid(algorithm, invalidLengthMessage, allowZeroKey = false) {
message: 'Usages cannot be empty when importing a secret key.'
});

assert.throws(() => {
key.toCryptoKey({ ...algorithm, length: 0 }, true, usages);
}, {
name: 'DataError',
message: invalidLengthMessage,
});
assert.throws(
() => key.toCryptoKey({ ...algorithm, length: 0 }, true, usages),
allowZeroKey && fips ? {
name: 'NotSupportedError',
message: 'Invalid key length',
} : {
name: 'DataError',
message: invalidLengthMessage,
});
}

function hmacVectors() {
Expand Down
8 changes: 2 additions & 6 deletions test/parallel/test-webcrypto-derivekey.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -284,7 +284,7 @@ const fips4 = hasFIPS(4);
})().then(common.mustCall());
}

if (hasOpenSSL(3)) {
if (hasOpenSSL(3) && !hasFIPS()) {
(async () => {
const derivedKeyAlgorithm = { name: 'KMAC128', length: 0 };
const usages = ['sign'];
Expand DownExpand Up@@ -326,11 +326,7 @@ if (hasOpenSSL(3)) {
name: 'KMAC128',
outputLength: 256,
}, derived, new Uint8Array());
if (fips4) {
await assert.rejects(signature, { name: 'OperationError' });
} else {
assert.strictEqual((await signature).byteLength, 32);
}
assert.strictEqual((await signature).byteLength, 32);
}
})().then(common.mustCall());
}
Expand Down
5 changes: 5 additions & 0 deletions test/parallel/test-webcrypto-digest-turboshake-rfc.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,6 +5,11 @@ const common = require('../common');
if (!common.hasCrypto)
common.skip('missing crypto');

const { hasFIPS } = require('../common/crypto');

if (hasFIPS())
common.skip('TurboSHAKE and KangarooTwelve are not available in FIPS mode');

const assert = require('assert');
const { subtle } = globalThis.crypto;

Expand Down
5 changes: 5 additions & 0 deletions test/parallel/test-webcrypto-digest-turboshake.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,6 +5,11 @@ const common = require('../common');
if (!common.hasCrypto)
common.skip('missing crypto');

const { hasFIPS } = require('../common/crypto');

if (hasFIPS())
common.skip('TurboSHAKE and KangarooTwelve are not available in FIPS mode');

const assert = require('assert');
const { subtle } = globalThis.crypto;

Expand Down
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Skip to content
Merged
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
4 changes: 4 additions & 0 deletions lib/internal/crypto/mac.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -20,6 +20,7 @@ const {
normalizeHashName,
numBitsToBytes,
truncateToBitLength,
validateKmacKeyLength,
} = require('internal/crypto/util');

const {
Expand DownExpand Up@@ -60,6 +61,9 @@ function normalizeKeyLength(handle, algorithm) {
length = algorithm.length;
}

if (algorithm.name === 'KMAC128' || algorithm.name === 'KMAC256')
validateKmacKeyLength(length);

return { handle, length };
}

Expand Down
14 changes: 14 additions & 0 deletions lib/internal/crypto/util.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -47,9 +47,12 @@ const {
EVP_PKEY_ML_KEM_1024,
kKeyVariantAES_OCB_128: hasAesOcbMode,
Argon2Job,
getFipsCrypto,
KmacJob,
} = internalBinding('crypto');

const isFips = getFipsCrypto() === 1;

const { getOptionValue } = require('internal/options');

const {
Expand DownExpand Up@@ -423,6 +426,8 @@ const conditionalAlgorithms = {
'Ed448': !process.features.openssl_is_boringssl,
'KMAC128': !!KmacJob,
'KMAC256': !!KmacJob,
'KT128': !isFips,
'KT256': !isFips,
'ML-DSA-44': !!EVP_PKEY_ML_DSA_44,
'ML-DSA-65': !!EVP_PKEY_ML_DSA_65,
'ML-DSA-87': !!EVP_PKEY_ML_DSA_87,
Expand All@@ -435,6 +440,8 @@ const conditionalAlgorithms = {
ArrayPrototypeIncludes(getHashes(), 'sha3-384'),
'SHA3-512': !process.features.openssl_is_boringssl ||
ArrayPrototypeIncludes(getHashes(), 'sha3-512'),
'TurboSHAKE128': !isFips,
'TurboSHAKE256': !isFips,
'X448': !process.features.openssl_is_boringssl,
};

Expand DownExpand Up@@ -579,6 +586,11 @@ function validateMaxBufferLength(data, name, max = kMaxBufferLength) {
}
}

function validateKmacKeyLength(length) {
if ((length < 32 || length % 8) && isFips)
throw lazyDOMException('Invalid key length', 'NotSupportedError');
}

/**
* Converts a bit length to the number of bytes needed to contain it.
* Non-byte lengths are rounded up to the next byte.
Expand DownExpand Up@@ -1097,6 +1109,7 @@ module.exports = {

kNamedCurveAliases,
kSupportedAlgorithms,
isFips,
normalizeAlgorithm,
normalizeHashName,
hasAnyNotIn,
Expand All@@ -1106,6 +1119,7 @@ module.exports = {
jobPromiseThen,
cleanupWebCryptoResult,
prepareWebCryptoResult,
validateKmacKeyLength,
validateMaxBufferLength,
numBitsToBytes,
truncateToBitLength,
Expand Down
51 changes: 34 additions & 17 deletions lib/internal/crypto/webidl.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,7 +9,6 @@ const {
StringPrototypeSplit,
StringPrototypeStartsWith,
StringPrototypeToLowerCase,
TypedArrayPrototypeGetLength,
} = primordials;

const {
Expand All@@ -27,8 +26,10 @@ const {
validateMaxBufferLength,
getBufferSourceByteLength,
getBufferSourceBytes,
isFips,
kNamedCurveAliases,
numBitsToBytes,
validateKmacKeyLength,
} = require('internal/crypto/util');
const {
converters: webidl,
Expand DownExpand Up@@ -252,30 +253,39 @@ function validateCShakeOutputLength(V) {
}
}

function bufferSourceEqualsAscii(V, string) {
if (getBufferSourceByteLength(V) !== string.length) return false;

const bytes = getBufferSourceBytes(V);
const length = TypedArrayPrototypeGetLength(bytes);
for (let i = 0; i < length; i++) {
if (bytes[i] !== StringPrototypeCharCodeAt(string, i)) return false;
}
return true;
}
const kCShakeFunctionNames = ['KMAC', 'TupleHash', 'ParallelHash'];

function validateCShakeFunctionName(V) {
if (getBufferSourceByteLength(V) === 0 ||
bufferSourceEqualsAscii(V, 'KMAC') ||
bufferSourceEqualsAscii(V, 'TupleHash') ||
bufferSourceEqualsAscii(V, 'ParallelHash')) {
return;
const length = getBufferSourceByteLength(V);
if (length === 0) return;

if (!isFips) {
const bytes = getBufferSourceBytes(V);
for (let i = 0; i < kCShakeFunctionNames.length; i++) {
const functionName = kCShakeFunctionNames[i];
if (length !== functionName.length) continue;

let j = 0;
for (; j < length; j++) {
if (bytes[j] !== StringPrototypeCharCodeAt(functionName, j)) break;
}
if (j === length) return;
}
}

throw lazyDOMException(
'Unsupported CShakeParams functionName',
'NotSupportedError');
}

function validateCShakeCustomization(V) {
if (isFips && getBufferSourceByteLength(V) !== 0)
throw lazyDOMException(
'Unsupported CShakeParams customization',
'NotSupportedError');
validateMaxBufferLength(V, 'CShakeParams.customization', 512);
}

converters.RsaPssParams = createDictionaryConverter(
'RsaPssParams', [
dictAlgorithm,
Expand DownExpand Up@@ -433,7 +443,7 @@ converters.CShakeParams = createDictionaryConverter(
{
key: 'customization',
converter: converters.BufferSource,
validator: (V, opts) => validateMaxBufferLength(V, 'CShakeParams.customization', 512),
validator: validateCShakeCustomization,
},
],
]);
Expand DownExpand Up@@ -719,6 +729,7 @@ for (let i = 0; i < kKmacDictionaries.length; i++) {
key: 'length',
converter: (V, opts) =>
converters['unsigned long'](V, enforceRangeOptions(opts)),
validator: validateKmacKeyLength,
},
],
]);
Expand All@@ -732,6 +743,12 @@ converters.KmacParams = createDictionaryConverter(
key: 'outputLength',
converter: (V, opts) =>
converters['unsigned long'](V, enforceRangeOptions(opts)),
validator: (V) => {
if ((V === 0 || V % 8) && isFips)
throw lazyDOMException(
'Invalid KmacParams outputLength',
'NotSupportedError');
},
required: true,
},
{
Expand Down
5 changes: 5 additions & 0 deletions src/crypto/crypto_hash.cc
Original file line numberDiff line numberDiff line change
Expand Up@@ -827,6 +827,11 @@ Maybe<void> CShakeTraits::AdditionalConfig(
CShakeConfig* params) {
Environment* env = Environment::GetCurrent(args);

if (IsFipsEnabled()) {
THROW_ERR_CRYPTO_UNSUPPORTED_OPERATION(env);
return Nothing<void>();
}

CHECK(args[offset]->IsString()); // Algorithm name
Utf8Value algorithm_name(env->isolate(), args[offset]);
std::string_view algorithm_str = algorithm_name.ToStringView();
Expand Down
2 changes: 2 additions & 0 deletions src/crypto/crypto_kmac.cc
Original file line numberDiff line numberDiff line change
Expand Up@@ -151,6 +151,8 @@ bool DeriveBitsWithCShake(const KmacConfig& params,
const void* key_data,
size_t key_size,
ByteSource* out) {
if (IsFipsEnabled()) return false;

const size_t key_length_bytes = NumBitsToBytes(params.key_length);
if (key_size < key_length_bytes) return false;

Expand Down
10 changes: 10 additions & 0 deletions src/crypto/crypto_turboshake.cc
Original file line numberDiff line numberDiff line change
Expand Up@@ -428,6 +428,11 @@ Maybe<void> TurboShakeTraits::AdditionalConfig(
TurboShakeConfig* params) {
Environment* env = Environment::GetCurrent(args);

if (IsFipsEnabled()) {
THROW_ERR_CRYPTO_UNSUPPORTED_OPERATION(env);
return Nothing<void>();
}

// args[offset + 0] = algorithm name (string)
CHECK(args[offset]->IsString());
Utf8Value algorithm_name(env->isolate(), args[offset]);
Expand DownExpand Up@@ -535,6 +540,11 @@ Maybe<void> KangarooTwelveTraits::AdditionalConfig(
KangarooTwelveConfig* params) {
Environment* env = Environment::GetCurrent(args);

if (IsFipsEnabled()) {
THROW_ERR_CRYPTO_UNSUPPORTED_OPERATION(env);
return Nothing<void>();
}

// args[offset + 0] = algorithm name (string)
CHECK(args[offset]->IsString());
Utf8Value algorithm_name(env->isolate(), args[offset]);
Expand Down
8 changes: 6 additions & 2 deletions src/crypto/crypto_util.cc
Original file line numberDiff line numberDiff line change
Expand Up@@ -146,6 +146,11 @@ bool InitCryptoOnce(Isolate* isolate) {
// be part of a larger mutex for global OpenSSL state.
static Mutex fips_mutex;

bool IsFipsEnabled() {
Mutex::ScopedLock fips_lock(fips_mutex);
return ncrypto::isFipsEnabled();
}

void InitCryptoOnce() {
Mutex::ScopedLock lock(per_process::cli_options_mutex);
Mutex::ScopedLock fips_lock(fips_mutex);
Expand DownExpand Up@@ -223,8 +228,7 @@ void InitCryptoOnce() {

void GetFipsCrypto(const FunctionCallbackInfo<Value>& args) {
Mutex::ScopedLock lock(per_process::cli_options_mutex);
Mutex::ScopedLock fips_lock(fips_mutex);
args.GetReturnValue().Set(ncrypto::isFipsEnabled() ? 1 : 0);
args.GetReturnValue().Set(IsFipsEnabled() ? 1 : 0);
}

void SetFipsCrypto(const FunctionCallbackInfo<Value>& args) {
Expand Down
1 change: 1 addition & 0 deletions src/crypto/crypto_util.h
Original file line numberDiff line numberDiff line change
Expand Up@@ -66,6 +66,7 @@ constexpr T NumBitsToBytes(T bits) {
// what went wrong, or std::nullopt when there was nothing to do or the
// options were applied successfully.
std::optional<std::string> ProcessFipsOptions();
bool IsFipsEnabled();

bool InitCryptoOnce(v8::Isolate* isolate);
void InitCryptoOnce();
Expand Down
28 changes: 21 additions & 7 deletions test/parallel/test-crypto-key-objects-to-crypto-key.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -14,6 +14,7 @@ const {
} = require('crypto');
const { hasFIPS } = require('../common/crypto');
const { kSupportedAlgorithms } = require('internal/crypto/util');
const fips = hasFIPS();
const rejectsXCurves = hasFIPS(3, 5);

const hashes = Object.keys(kSupportedAlgorithms.digest).filter((name) => {
Expand DownExpand Up@@ -142,14 +143,24 @@ function macInvalid(algorithm, invalidLengthMessage, allowZeroKey = false) {
const key = createSecretKey(randomBytes(32));
const usages = ['sign', 'verify'];

if (allowZeroKey) {
if (allowZeroKey && !fips) {
const zeroKey = createSecretKey(Buffer.alloc(0))
.toCryptoKey(algorithm, true, usages);
assert.strictEqual(zeroKey.algorithm.length, 0);

const explicitZeroKey = createSecretKey(Buffer.alloc(0))
.toCryptoKey({ ...algorithm, length: 0 }, true, usages);
assert.strictEqual(explicitZeroKey.algorithm.length, 0);
} else if (allowZeroKey) {
for (const zeroAlgorithm of [algorithm, { ...algorithm, length: 0 }]) {
assert.throws(() => {
createSecretKey(Buffer.alloc(0))
.toCryptoKey(zeroAlgorithm, true, usages);
}, {
name: 'NotSupportedError',
message: 'Invalid key length',
});
}
} else {
assert.throws(() => {
createSecretKey(Buffer.alloc(0)).toCryptoKey(algorithm, true, usages);
Expand All@@ -164,12 +175,15 @@ function macInvalid(algorithm, invalidLengthMessage, allowZeroKey = false) {
message: 'Usages cannot be empty when importing a secret key.'
});

assert.throws(() => {
key.toCryptoKey({ ...algorithm, length: 0 }, true, usages);
}, {
name: 'DataError',
message: invalidLengthMessage,
});
assert.throws(
() => key.toCryptoKey({ ...algorithm, length: 0 }, true, usages),
allowZeroKey && fips ? {
name: 'NotSupportedError',
message: 'Invalid key length',
} : {
name: 'DataError',
message: invalidLengthMessage,
});
}

function hmacVectors() {
Expand Down
8 changes: 2 additions & 6 deletions test/parallel/test-webcrypto-derivekey.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -284,7 +284,7 @@ const fips4 = hasFIPS(4);
})().then(common.mustCall());
}

if (hasOpenSSL(3)) {
if (hasOpenSSL(3) && !hasFIPS()) {
(async () => {
const derivedKeyAlgorithm = { name: 'KMAC128', length: 0 };
const usages = ['sign'];
Expand DownExpand Up@@ -326,11 +326,7 @@ if (hasOpenSSL(3)) {
name: 'KMAC128',
outputLength: 256,
}, derived, new Uint8Array());
if (fips4) {
await assert.rejects(signature, { name: 'OperationError' });
} else {
assert.strictEqual((await signature).byteLength, 32);
}
assert.strictEqual((await signature).byteLength, 32);
}
})().then(common.mustCall());
}
Expand Down
5 changes: 5 additions & 0 deletions test/parallel/test-webcrypto-digest-turboshake-rfc.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,6 +5,11 @@ const common = require('../common');
if (!common.hasCrypto)
common.skip('missing crypto');

const { hasFIPS } = require('../common/crypto');

if (hasFIPS())
common.skip('TurboSHAKE and KangarooTwelve are not available in FIPS mode');

const assert = require('assert');
const { subtle } = globalThis.crypto;

Expand Down
5 changes: 5 additions & 0 deletions test/parallel/test-webcrypto-digest-turboshake.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,6 +5,11 @@ const common = require('../common');
if (!common.hasCrypto)
common.skip('missing crypto');

const { hasFIPS } = require('../common/crypto');

if (hasFIPS())
common.skip('TurboSHAKE and KangarooTwelve are not available in FIPS mode');

const assert = require('assert');
const { subtle } = globalThis.crypto;

Expand Down
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix"); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
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
4 changes: 4 additions & 0 deletions lib/internal/crypto/mac.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -20,6 +20,7 @@ const {
normalizeHashName,
numBitsToBytes,
truncateToBitLength,
validateKmacKeyLength,
} = require('internal/crypto/util');

const {
Expand DownExpand Up@@ -60,6 +61,9 @@ function normalizeKeyLength(handle, algorithm) {
length = algorithm.length;
}

if (algorithm.name === 'KMAC128' || algorithm.name === 'KMAC256')
validateKmacKeyLength(length);

return { handle, length };
}

Expand Down
14 changes: 14 additions & 0 deletions lib/internal/crypto/util.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -47,9 +47,12 @@ const {
EVP_PKEY_ML_KEM_1024,
kKeyVariantAES_OCB_128: hasAesOcbMode,
Argon2Job,
getFipsCrypto,
KmacJob,
} = internalBinding('crypto');

const isFips = getFipsCrypto() === 1;

const { getOptionValue } = require('internal/options');

const {
Expand DownExpand Up@@ -423,6 +426,8 @@ const conditionalAlgorithms = {
'Ed448': !process.features.openssl_is_boringssl,
'KMAC128': !!KmacJob,
'KMAC256': !!KmacJob,
'KT128': !isFips,
'KT256': !isFips,
'ML-DSA-44': !!EVP_PKEY_ML_DSA_44,
'ML-DSA-65': !!EVP_PKEY_ML_DSA_65,
'ML-DSA-87': !!EVP_PKEY_ML_DSA_87,
Expand All@@ -435,6 +440,8 @@ const conditionalAlgorithms = {
ArrayPrototypeIncludes(getHashes(), 'sha3-384'),
'SHA3-512': !process.features.openssl_is_boringssl ||
ArrayPrototypeIncludes(getHashes(), 'sha3-512'),
'TurboSHAKE128': !isFips,
'TurboSHAKE256': !isFips,
'X448': !process.features.openssl_is_boringssl,
};

Expand DownExpand Up@@ -579,6 +586,11 @@ function validateMaxBufferLength(data, name, max = kMaxBufferLength) {
}
}

function validateKmacKeyLength(length) {
if ((length < 32 || length % 8) && isFips)
throw lazyDOMException('Invalid key length', 'NotSupportedError');
}

/**
* Converts a bit length to the number of bytes needed to contain it.
* Non-byte lengths are rounded up to the next byte.
Expand DownExpand Up@@ -1097,6 +1109,7 @@ module.exports = {

kNamedCurveAliases,
kSupportedAlgorithms,
isFips,
normalizeAlgorithm,
normalizeHashName,
hasAnyNotIn,
Expand All@@ -1106,6 +1119,7 @@ module.exports = {
jobPromiseThen,
cleanupWebCryptoResult,
prepareWebCryptoResult,
validateKmacKeyLength,
validateMaxBufferLength,
numBitsToBytes,
truncateToBitLength,
Expand Down
51 changes: 34 additions & 17 deletions lib/internal/crypto/webidl.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,7 +9,6 @@ const {
StringPrototypeSplit,
StringPrototypeStartsWith,
StringPrototypeToLowerCase,
TypedArrayPrototypeGetLength,
} = primordials;

const {
Expand All@@ -27,8 +26,10 @@ const {
validateMaxBufferLength,
getBufferSourceByteLength,
getBufferSourceBytes,
isFips,
kNamedCurveAliases,
numBitsToBytes,
validateKmacKeyLength,
} = require('internal/crypto/util');
const {
converters: webidl,
Expand DownExpand Up@@ -252,30 +253,39 @@ function validateCShakeOutputLength(V) {
}
}

function bufferSourceEqualsAscii(V, string) {
if (getBufferSourceByteLength(V) !== string.length) return false;

const bytes = getBufferSourceBytes(V);
const length = TypedArrayPrototypeGetLength(bytes);
for (let i = 0; i < length; i++) {
if (bytes[i] !== StringPrototypeCharCodeAt(string, i)) return false;
}
return true;
}
const kCShakeFunctionNames = ['KMAC', 'TupleHash', 'ParallelHash'];

function validateCShakeFunctionName(V) {
if (getBufferSourceByteLength(V) === 0 ||
bufferSourceEqualsAscii(V, 'KMAC') ||
bufferSourceEqualsAscii(V, 'TupleHash') ||
bufferSourceEqualsAscii(V, 'ParallelHash')) {
return;
const length = getBufferSourceByteLength(V);
if (length === 0) return;

if (!isFips) {
const bytes = getBufferSourceBytes(V);
for (let i = 0; i < kCShakeFunctionNames.length; i++) {
const functionName = kCShakeFunctionNames[i];
if (length !== functionName.length) continue;

let j = 0;
for (; j < length; j++) {
if (bytes[j] !== StringPrototypeCharCodeAt(functionName, j)) break;
}
if (j === length) return;
}
}

throw lazyDOMException(
'Unsupported CShakeParams functionName',
'NotSupportedError');
}

function validateCShakeCustomization(V) {
if (isFips && getBufferSourceByteLength(V) !== 0)
throw lazyDOMException(
'Unsupported CShakeParams customization',
'NotSupportedError');
validateMaxBufferLength(V, 'CShakeParams.customization', 512);
}

converters.RsaPssParams = createDictionaryConverter(
'RsaPssParams', [
dictAlgorithm,
Expand DownExpand Up@@ -433,7 +443,7 @@ converters.CShakeParams = createDictionaryConverter(
{
key: 'customization',
converter: converters.BufferSource,
validator: (V, opts) => validateMaxBufferLength(V, 'CShakeParams.customization', 512),
validator: validateCShakeCustomization,
},
],
]);
Expand DownExpand Up@@ -719,6 +729,7 @@ for (let i = 0; i < kKmacDictionaries.length; i++) {
key: 'length',
converter: (V, opts) =>
converters['unsigned long'](V, enforceRangeOptions(opts)),
validator: validateKmacKeyLength,
},
],
]);
Expand All@@ -732,6 +743,12 @@ converters.KmacParams = createDictionaryConverter(
key: 'outputLength',
converter: (V, opts) =>
converters['unsigned long'](V, enforceRangeOptions(opts)),
validator: (V) => {
if ((V === 0 || V % 8) && isFips)
throw lazyDOMException(
'Invalid KmacParams outputLength',
'NotSupportedError');
},
required: true,
},
{
Expand Down
5 changes: 5 additions & 0 deletions src/crypto/crypto_hash.cc
Original file line numberDiff line numberDiff line change
Expand Up@@ -827,6 +827,11 @@ Maybe<void> CShakeTraits::AdditionalConfig(
CShakeConfig* params) {
Environment* env = Environment::GetCurrent(args);

if (IsFipsEnabled()) {
THROW_ERR_CRYPTO_UNSUPPORTED_OPERATION(env);
return Nothing<void>();
}

CHECK(args[offset]->IsString()); // Algorithm name
Utf8Value algorithm_name(env->isolate(), args[offset]);
std::string_view algorithm_str = algorithm_name.ToStringView();
Expand Down
2 changes: 2 additions & 0 deletions src/crypto/crypto_kmac.cc
Original file line numberDiff line numberDiff line change
Expand Up@@ -151,6 +151,8 @@ bool DeriveBitsWithCShake(const KmacConfig& params,
const void* key_data,
size_t key_size,
ByteSource* out) {
if (IsFipsEnabled()) return false;

const size_t key_length_bytes = NumBitsToBytes(params.key_length);
if (key_size < key_length_bytes) return false;

Expand Down
10 changes: 10 additions & 0 deletions src/crypto/crypto_turboshake.cc
Original file line numberDiff line numberDiff line change
Expand Up@@ -428,6 +428,11 @@ Maybe<void> TurboShakeTraits::AdditionalConfig(
TurboShakeConfig* params) {
Environment* env = Environment::GetCurrent(args);

if (IsFipsEnabled()) {
THROW_ERR_CRYPTO_UNSUPPORTED_OPERATION(env);
return Nothing<void>();
}

// args[offset + 0] = algorithm name (string)
CHECK(args[offset]->IsString());
Utf8Value algorithm_name(env->isolate(), args[offset]);
Expand DownExpand Up@@ -535,6 +540,11 @@ Maybe<void> KangarooTwelveTraits::AdditionalConfig(
KangarooTwelveConfig* params) {
Environment* env = Environment::GetCurrent(args);

if (IsFipsEnabled()) {
THROW_ERR_CRYPTO_UNSUPPORTED_OPERATION(env);
return Nothing<void>();
}

// args[offset + 0] = algorithm name (string)
CHECK(args[offset]->IsString());
Utf8Value algorithm_name(env->isolate(), args[offset]);
Expand Down
8 changes: 6 additions & 2 deletions src/crypto/crypto_util.cc
Original file line numberDiff line numberDiff line change
Expand Up@@ -146,6 +146,11 @@ bool InitCryptoOnce(Isolate* isolate) {
// be part of a larger mutex for global OpenSSL state.
static Mutex fips_mutex;

bool IsFipsEnabled() {
Mutex::ScopedLock fips_lock(fips_mutex);
return ncrypto::isFipsEnabled();
}

void InitCryptoOnce() {
Mutex::ScopedLock lock(per_process::cli_options_mutex);
Mutex::ScopedLock fips_lock(fips_mutex);
Expand DownExpand Up@@ -223,8 +228,7 @@ void InitCryptoOnce() {

void GetFipsCrypto(const FunctionCallbackInfo<Value>& args) {
Mutex::ScopedLock lock(per_process::cli_options_mutex);
Mutex::ScopedLock fips_lock(fips_mutex);
args.GetReturnValue().Set(ncrypto::isFipsEnabled() ? 1 : 0);
args.GetReturnValue().Set(IsFipsEnabled() ? 1 : 0);
}

void SetFipsCrypto(const FunctionCallbackInfo<Value>& args) {
Expand Down
1 change: 1 addition & 0 deletions src/crypto/crypto_util.h
Original file line numberDiff line numberDiff line change
Expand Up@@ -66,6 +66,7 @@ constexpr T NumBitsToBytes(T bits) {
// what went wrong, or std::nullopt when there was nothing to do or the
// options were applied successfully.
std::optional<std::string> ProcessFipsOptions();
bool IsFipsEnabled();

bool InitCryptoOnce(v8::Isolate* isolate);
void InitCryptoOnce();
Expand Down
28 changes: 21 additions & 7 deletions test/parallel/test-crypto-key-objects-to-crypto-key.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -14,6 +14,7 @@ const {
} = require('crypto');
const { hasFIPS } = require('../common/crypto');
const { kSupportedAlgorithms } = require('internal/crypto/util');
const fips = hasFIPS();
const rejectsXCurves = hasFIPS(3, 5);

const hashes = Object.keys(kSupportedAlgorithms.digest).filter((name) => {
Expand DownExpand Up@@ -142,14 +143,24 @@ function macInvalid(algorithm, invalidLengthMessage, allowZeroKey = false) {
const key = createSecretKey(randomBytes(32));
const usages = ['sign', 'verify'];

if (allowZeroKey) {
if (allowZeroKey && !fips) {
const zeroKey = createSecretKey(Buffer.alloc(0))
.toCryptoKey(algorithm, true, usages);
assert.strictEqual(zeroKey.algorithm.length, 0);

const explicitZeroKey = createSecretKey(Buffer.alloc(0))
.toCryptoKey({ ...algorithm, length: 0 }, true, usages);
assert.strictEqual(explicitZeroKey.algorithm.length, 0);
} else if (allowZeroKey) {
for (const zeroAlgorithm of [algorithm, { ...algorithm, length: 0 }]) {
assert.throws(() => {
createSecretKey(Buffer.alloc(0))
.toCryptoKey(zeroAlgorithm, true, usages);
}, {
name: 'NotSupportedError',
message: 'Invalid key length',
});
}
} else {
assert.throws(() => {
createSecretKey(Buffer.alloc(0)).toCryptoKey(algorithm, true, usages);
Expand All@@ -164,12 +175,15 @@ function macInvalid(algorithm, invalidLengthMessage, allowZeroKey = false) {
message: 'Usages cannot be empty when importing a secret key.'
});

assert.throws(() => {
key.toCryptoKey({ ...algorithm, length: 0 }, true, usages);
}, {
name: 'DataError',
message: invalidLengthMessage,
});
assert.throws(
() => key.toCryptoKey({ ...algorithm, length: 0 }, true, usages),
allowZeroKey && fips ? {
name: 'NotSupportedError',
message: 'Invalid key length',
} : {
name: 'DataError',
message: invalidLengthMessage,
});
}

function hmacVectors() {
Expand Down
8 changes: 2 additions & 6 deletions test/parallel/test-webcrypto-derivekey.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -284,7 +284,7 @@ const fips4 = hasFIPS(4);
})().then(common.mustCall());
}

if (hasOpenSSL(3)) {
if (hasOpenSSL(3) && !hasFIPS()) {
(async () => {
const derivedKeyAlgorithm = { name: 'KMAC128', length: 0 };
const usages = ['sign'];
Expand DownExpand Up@@ -326,11 +326,7 @@ if (hasOpenSSL(3)) {
name: 'KMAC128',
outputLength: 256,
}, derived, new Uint8Array());
if (fips4) {
await assert.rejects(signature, { name: 'OperationError' });
} else {
assert.strictEqual((await signature).byteLength, 32);
}
assert.strictEqual((await signature).byteLength, 32);
}
})().then(common.mustCall());
}
Expand Down
5 changes: 5 additions & 0 deletions test/parallel/test-webcrypto-digest-turboshake-rfc.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,6 +5,11 @@ const common = require('../common');
if (!common.hasCrypto)
common.skip('missing crypto');

const { hasFIPS } = require('../common/crypto');

if (hasFIPS())
common.skip('TurboSHAKE and KangarooTwelve are not available in FIPS mode');

const assert = require('assert');
const { subtle } = globalThis.crypto;

Expand Down
5 changes: 5 additions & 0 deletions test/parallel/test-webcrypto-digest-turboshake.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,6 +5,11 @@ const common = require('../common');
if (!common.hasCrypto)
common.skip('missing crypto');

const { hasFIPS } = require('../common/crypto');

if (hasFIPS())
common.skip('TurboSHAKE and KangarooTwelve are not available in FIPS mode');

const assert = require('assert');
const { subtle } = globalThis.crypto;

Expand Down
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms"); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
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
4 changes: 4 additions & 0 deletions lib/internal/crypto/mac.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -20,6 +20,7 @@ const {
normalizeHashName,
numBitsToBytes,
truncateToBitLength,
validateKmacKeyLength,
} = require('internal/crypto/util');

const {
Expand DownExpand Up@@ -60,6 +61,9 @@ function normalizeKeyLength(handle, algorithm) {
length = algorithm.length;
}

if (algorithm.name === 'KMAC128' || algorithm.name === 'KMAC256')
validateKmacKeyLength(length);

return { handle, length };
}

Expand Down
14 changes: 14 additions & 0 deletions lib/internal/crypto/util.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -47,9 +47,12 @@ const {
EVP_PKEY_ML_KEM_1024,
kKeyVariantAES_OCB_128: hasAesOcbMode,
Argon2Job,
getFipsCrypto,
KmacJob,
} = internalBinding('crypto');

const isFips = getFipsCrypto() === 1;

const { getOptionValue } = require('internal/options');

const {
Expand DownExpand Up@@ -423,6 +426,8 @@ const conditionalAlgorithms = {
'Ed448': !process.features.openssl_is_boringssl,
'KMAC128': !!KmacJob,
'KMAC256': !!KmacJob,
'KT128': !isFips,
'KT256': !isFips,
'ML-DSA-44': !!EVP_PKEY_ML_DSA_44,
'ML-DSA-65': !!EVP_PKEY_ML_DSA_65,
'ML-DSA-87': !!EVP_PKEY_ML_DSA_87,
Expand All@@ -435,6 +440,8 @@ const conditionalAlgorithms = {
ArrayPrototypeIncludes(getHashes(), 'sha3-384'),
'SHA3-512': !process.features.openssl_is_boringssl ||
ArrayPrototypeIncludes(getHashes(), 'sha3-512'),
'TurboSHAKE128': !isFips,
'TurboSHAKE256': !isFips,
'X448': !process.features.openssl_is_boringssl,
};

Expand DownExpand Up@@ -579,6 +586,11 @@ function validateMaxBufferLength(data, name, max = kMaxBufferLength) {
}
}

function validateKmacKeyLength(length) {
if ((length < 32 || length % 8) && isFips)
throw lazyDOMException('Invalid key length', 'NotSupportedError');
}

/**
* Converts a bit length to the number of bytes needed to contain it.
* Non-byte lengths are rounded up to the next byte.
Expand DownExpand Up@@ -1097,6 +1109,7 @@ module.exports = {

kNamedCurveAliases,
kSupportedAlgorithms,
isFips,
normalizeAlgorithm,
normalizeHashName,
hasAnyNotIn,
Expand All@@ -1106,6 +1119,7 @@ module.exports = {
jobPromiseThen,
cleanupWebCryptoResult,
prepareWebCryptoResult,
validateKmacKeyLength,
validateMaxBufferLength,
numBitsToBytes,
truncateToBitLength,
Expand Down
51 changes: 34 additions & 17 deletions lib/internal/crypto/webidl.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,7 +9,6 @@ const {
StringPrototypeSplit,
StringPrototypeStartsWith,
StringPrototypeToLowerCase,
TypedArrayPrototypeGetLength,
} = primordials;

const {
Expand All@@ -27,8 +26,10 @@ const {
validateMaxBufferLength,
getBufferSourceByteLength,
getBufferSourceBytes,
isFips,
kNamedCurveAliases,
numBitsToBytes,
validateKmacKeyLength,
} = require('internal/crypto/util');
const {
converters: webidl,
Expand DownExpand Up@@ -252,30 +253,39 @@ function validateCShakeOutputLength(V) {
}
}

function bufferSourceEqualsAscii(V, string) {
if (getBufferSourceByteLength(V) !== string.length) return false;

const bytes = getBufferSourceBytes(V);
const length = TypedArrayPrototypeGetLength(bytes);
for (let i = 0; i < length; i++) {
if (bytes[i] !== StringPrototypeCharCodeAt(string, i)) return false;
}
return true;
}
const kCShakeFunctionNames = ['KMAC', 'TupleHash', 'ParallelHash'];

function validateCShakeFunctionName(V) {
if (getBufferSourceByteLength(V) === 0 ||
bufferSourceEqualsAscii(V, 'KMAC') ||
bufferSourceEqualsAscii(V, 'TupleHash') ||
bufferSourceEqualsAscii(V, 'ParallelHash')) {
return;
const length = getBufferSourceByteLength(V);
if (length === 0) return;

if (!isFips) {
const bytes = getBufferSourceBytes(V);
for (let i = 0; i < kCShakeFunctionNames.length; i++) {
const functionName = kCShakeFunctionNames[i];
if (length !== functionName.length) continue;

let j = 0;
for (; j < length; j++) {
if (bytes[j] !== StringPrototypeCharCodeAt(functionName, j)) break;
}
if (j === length) return;
}
}

throw lazyDOMException(
'Unsupported CShakeParams functionName',
'NotSupportedError');
}

function validateCShakeCustomization(V) {
if (isFips && getBufferSourceByteLength(V) !== 0)
throw lazyDOMException(
'Unsupported CShakeParams customization',
'NotSupportedError');
validateMaxBufferLength(V, 'CShakeParams.customization', 512);
}

converters.RsaPssParams = createDictionaryConverter(
'RsaPssParams', [
dictAlgorithm,
Expand DownExpand Up@@ -433,7 +443,7 @@ converters.CShakeParams = createDictionaryConverter(
{
key: 'customization',
converter: converters.BufferSource,
validator: (V, opts) => validateMaxBufferLength(V, 'CShakeParams.customization', 512),
validator: validateCShakeCustomization,
},
],
]);
Expand DownExpand Up@@ -719,6 +729,7 @@ for (let i = 0; i < kKmacDictionaries.length; i++) {
key: 'length',
converter: (V, opts) =>
converters['unsigned long'](V, enforceRangeOptions(opts)),
validator: validateKmacKeyLength,
},
],
]);
Expand All@@ -732,6 +743,12 @@ converters.KmacParams = createDictionaryConverter(
key: 'outputLength',
converter: (V, opts) =>
converters['unsigned long'](V, enforceRangeOptions(opts)),
validator: (V) => {
if ((V === 0 || V % 8) && isFips)
throw lazyDOMException(
'Invalid KmacParams outputLength',
'NotSupportedError');
},
required: true,
},
{
Expand Down
5 changes: 5 additions & 0 deletions src/crypto/crypto_hash.cc
Original file line numberDiff line numberDiff line change
Expand Up@@ -827,6 +827,11 @@ Maybe<void> CShakeTraits::AdditionalConfig(
CShakeConfig* params) {
Environment* env = Environment::GetCurrent(args);

if (IsFipsEnabled()) {
THROW_ERR_CRYPTO_UNSUPPORTED_OPERATION(env);
return Nothing<void>();
}

CHECK(args[offset]->IsString()); // Algorithm name
Utf8Value algorithm_name(env->isolate(), args[offset]);
std::string_view algorithm_str = algorithm_name.ToStringView();
Expand Down
2 changes: 2 additions & 0 deletions src/crypto/crypto_kmac.cc
Original file line numberDiff line numberDiff line change
Expand Up@@ -151,6 +151,8 @@ bool DeriveBitsWithCShake(const KmacConfig& params,
const void* key_data,
size_t key_size,
ByteSource* out) {
if (IsFipsEnabled()) return false;

const size_t key_length_bytes = NumBitsToBytes(params.key_length);
if (key_size < key_length_bytes) return false;

Expand Down
10 changes: 10 additions & 0 deletions src/crypto/crypto_turboshake.cc
Original file line numberDiff line numberDiff line change
Expand Up@@ -428,6 +428,11 @@ Maybe<void> TurboShakeTraits::AdditionalConfig(
TurboShakeConfig* params) {
Environment* env = Environment::GetCurrent(args);

if (IsFipsEnabled()) {
THROW_ERR_CRYPTO_UNSUPPORTED_OPERATION(env);
return Nothing<void>();
}

// args[offset + 0] = algorithm name (string)
CHECK(args[offset]->IsString());
Utf8Value algorithm_name(env->isolate(), args[offset]);
Expand DownExpand Up@@ -535,6 +540,11 @@ Maybe<void> KangarooTwelveTraits::AdditionalConfig(
KangarooTwelveConfig* params) {
Environment* env = Environment::GetCurrent(args);

if (IsFipsEnabled()) {
THROW_ERR_CRYPTO_UNSUPPORTED_OPERATION(env);
return Nothing<void>();
}

// args[offset + 0] = algorithm name (string)
CHECK(args[offset]->IsString());
Utf8Value algorithm_name(env->isolate(), args[offset]);
Expand Down
8 changes: 6 additions & 2 deletions src/crypto/crypto_util.cc
Original file line numberDiff line numberDiff line change
Expand Up@@ -146,6 +146,11 @@ bool InitCryptoOnce(Isolate* isolate) {
// be part of a larger mutex for global OpenSSL state.
static Mutex fips_mutex;

bool IsFipsEnabled() {
Mutex::ScopedLock fips_lock(fips_mutex);
return ncrypto::isFipsEnabled();
}

void InitCryptoOnce() {
Mutex::ScopedLock lock(per_process::cli_options_mutex);
Mutex::ScopedLock fips_lock(fips_mutex);
Expand DownExpand Up@@ -223,8 +228,7 @@ void InitCryptoOnce() {

void GetFipsCrypto(const FunctionCallbackInfo<Value>& args) {
Mutex::ScopedLock lock(per_process::cli_options_mutex);
Mutex::ScopedLock fips_lock(fips_mutex);
args.GetReturnValue().Set(ncrypto::isFipsEnabled() ? 1 : 0);
args.GetReturnValue().Set(IsFipsEnabled() ? 1 : 0);
}

void SetFipsCrypto(const FunctionCallbackInfo<Value>& args) {
Expand Down
1 change: 1 addition & 0 deletions src/crypto/crypto_util.h
Original file line numberDiff line numberDiff line change
Expand Up@@ -66,6 +66,7 @@ constexpr T NumBitsToBytes(T bits) {
// what went wrong, or std::nullopt when there was nothing to do or the
// options were applied successfully.
std::optional<std::string> ProcessFipsOptions();
bool IsFipsEnabled();

bool InitCryptoOnce(v8::Isolate* isolate);
void InitCryptoOnce();
Expand Down
28 changes: 21 additions & 7 deletions test/parallel/test-crypto-key-objects-to-crypto-key.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -14,6 +14,7 @@ const {
} = require('crypto');
const { hasFIPS } = require('../common/crypto');
const { kSupportedAlgorithms } = require('internal/crypto/util');
const fips = hasFIPS();
const rejectsXCurves = hasFIPS(3, 5);

const hashes = Object.keys(kSupportedAlgorithms.digest).filter((name) => {
Expand DownExpand Up@@ -142,14 +143,24 @@ function macInvalid(algorithm, invalidLengthMessage, allowZeroKey = false) {
const key = createSecretKey(randomBytes(32));
const usages = ['sign', 'verify'];

if (allowZeroKey) {
if (allowZeroKey && !fips) {
const zeroKey = createSecretKey(Buffer.alloc(0))
.toCryptoKey(algorithm, true, usages);
assert.strictEqual(zeroKey.algorithm.length, 0);

const explicitZeroKey = createSecretKey(Buffer.alloc(0))
.toCryptoKey({ ...algorithm, length: 0 }, true, usages);
assert.strictEqual(explicitZeroKey.algorithm.length, 0);
} else if (allowZeroKey) {
for (const zeroAlgorithm of [algorithm, { ...algorithm, length: 0 }]) {
assert.throws(() => {
createSecretKey(Buffer.alloc(0))
.toCryptoKey(zeroAlgorithm, true, usages);
}, {
name: 'NotSupportedError',
message: 'Invalid key length',
});
}
} else {
assert.throws(() => {
createSecretKey(Buffer.alloc(0)).toCryptoKey(algorithm, true, usages);
Expand All@@ -164,12 +175,15 @@ function macInvalid(algorithm, invalidLengthMessage, allowZeroKey = false) {
message: 'Usages cannot be empty when importing a secret key.'
});

assert.throws(() => {
key.toCryptoKey({ ...algorithm, length: 0 }, true, usages);
}, {
name: 'DataError',
message: invalidLengthMessage,
});
assert.throws(
() => key.toCryptoKey({ ...algorithm, length: 0 }, true, usages),
allowZeroKey && fips ? {
name: 'NotSupportedError',
message: 'Invalid key length',
} : {
name: 'DataError',
message: invalidLengthMessage,
});
}

function hmacVectors() {
Expand Down
8 changes: 2 additions & 6 deletions test/parallel/test-webcrypto-derivekey.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -284,7 +284,7 @@ const fips4 = hasFIPS(4);
})().then(common.mustCall());
}

if (hasOpenSSL(3)) {
if (hasOpenSSL(3) && !hasFIPS()) {
(async () => {
const derivedKeyAlgorithm = { name: 'KMAC128', length: 0 };
const usages = ['sign'];
Expand DownExpand Up@@ -326,11 +326,7 @@ if (hasOpenSSL(3)) {
name: 'KMAC128',
outputLength: 256,
}, derived, new Uint8Array());
if (fips4) {
await assert.rejects(signature, { name: 'OperationError' });
} else {
assert.strictEqual((await signature).byteLength, 32);
}
assert.strictEqual((await signature).byteLength, 32);
}
})().then(common.mustCall());
}
Expand Down
5 changes: 5 additions & 0 deletions test/parallel/test-webcrypto-digest-turboshake-rfc.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,6 +5,11 @@ const common = require('../common');
if (!common.hasCrypto)
common.skip('missing crypto');

const { hasFIPS } = require('../common/crypto');

if (hasFIPS())
common.skip('TurboSHAKE and KangarooTwelve are not available in FIPS mode');

const assert = require('assert');
const { subtle } = globalThis.crypto;

Expand Down
5 changes: 5 additions & 0 deletions test/parallel/test-webcrypto-digest-turboshake.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,6 +5,11 @@ const common = require('../common');
if (!common.hasCrypto)
common.skip('missing crypto');

const { hasFIPS } = require('../common/crypto');

if (hasFIPS())
common.skip('TurboSHAKE and KangarooTwelve are not available in FIPS mode');

const assert = require('assert');
const { subtle } = globalThis.crypto;

Expand Down
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links"); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + '
Skip to content
Merged
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
4 changes: 4 additions & 0 deletions lib/internal/crypto/mac.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -20,6 +20,7 @@ const {
normalizeHashName,
numBitsToBytes,
truncateToBitLength,
validateKmacKeyLength,
} = require('internal/crypto/util');

const {
Expand DownExpand Up@@ -60,6 +61,9 @@ function normalizeKeyLength(handle, algorithm) {
length = algorithm.length;
}

if (algorithm.name === 'KMAC128' || algorithm.name === 'KMAC256')
validateKmacKeyLength(length);

return { handle, length };
}

Expand Down
14 changes: 14 additions & 0 deletions lib/internal/crypto/util.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -47,9 +47,12 @@ const {
EVP_PKEY_ML_KEM_1024,
kKeyVariantAES_OCB_128: hasAesOcbMode,
Argon2Job,
getFipsCrypto,
KmacJob,
} = internalBinding('crypto');

const isFips = getFipsCrypto() === 1;

const { getOptionValue } = require('internal/options');

const {
Expand DownExpand Up@@ -423,6 +426,8 @@ const conditionalAlgorithms = {
'Ed448': !process.features.openssl_is_boringssl,
'KMAC128': !!KmacJob,
'KMAC256': !!KmacJob,
'KT128': !isFips,
'KT256': !isFips,
'ML-DSA-44': !!EVP_PKEY_ML_DSA_44,
'ML-DSA-65': !!EVP_PKEY_ML_DSA_65,
'ML-DSA-87': !!EVP_PKEY_ML_DSA_87,
Expand All@@ -435,6 +440,8 @@ const conditionalAlgorithms = {
ArrayPrototypeIncludes(getHashes(), 'sha3-384'),
'SHA3-512': !process.features.openssl_is_boringssl ||
ArrayPrototypeIncludes(getHashes(), 'sha3-512'),
'TurboSHAKE128': !isFips,
'TurboSHAKE256': !isFips,
'X448': !process.features.openssl_is_boringssl,
};

Expand DownExpand Up@@ -579,6 +586,11 @@ function validateMaxBufferLength(data, name, max = kMaxBufferLength) {
}
}

function validateKmacKeyLength(length) {
if ((length < 32 || length % 8) && isFips)
throw lazyDOMException('Invalid key length', 'NotSupportedError');
}

/**
* Converts a bit length to the number of bytes needed to contain it.
* Non-byte lengths are rounded up to the next byte.
Expand DownExpand Up@@ -1097,6 +1109,7 @@ module.exports = {

kNamedCurveAliases,
kSupportedAlgorithms,
isFips,
normalizeAlgorithm,
normalizeHashName,
hasAnyNotIn,
Expand All@@ -1106,6 +1119,7 @@ module.exports = {
jobPromiseThen,
cleanupWebCryptoResult,
prepareWebCryptoResult,
validateKmacKeyLength,
validateMaxBufferLength,
numBitsToBytes,
truncateToBitLength,
Expand Down
51 changes: 34 additions & 17 deletions lib/internal/crypto/webidl.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,7 +9,6 @@ const {
StringPrototypeSplit,
StringPrototypeStartsWith,
StringPrototypeToLowerCase,
TypedArrayPrototypeGetLength,
} = primordials;

const {
Expand All@@ -27,8 +26,10 @@ const {
validateMaxBufferLength,
getBufferSourceByteLength,
getBufferSourceBytes,
isFips,
kNamedCurveAliases,
numBitsToBytes,
validateKmacKeyLength,
} = require('internal/crypto/util');
const {
converters: webidl,
Expand DownExpand Up@@ -252,30 +253,39 @@ function validateCShakeOutputLength(V) {
}
}

function bufferSourceEqualsAscii(V, string) {
if (getBufferSourceByteLength(V) !== string.length) return false;

const bytes = getBufferSourceBytes(V);
const length = TypedArrayPrototypeGetLength(bytes);
for (let i = 0; i < length; i++) {
if (bytes[i] !== StringPrototypeCharCodeAt(string, i)) return false;
}
return true;
}
const kCShakeFunctionNames = ['KMAC', 'TupleHash', 'ParallelHash'];

function validateCShakeFunctionName(V) {
if (getBufferSourceByteLength(V) === 0 ||
bufferSourceEqualsAscii(V, 'KMAC') ||
bufferSourceEqualsAscii(V, 'TupleHash') ||
bufferSourceEqualsAscii(V, 'ParallelHash')) {
return;
const length = getBufferSourceByteLength(V);
if (length === 0) return;

if (!isFips) {
const bytes = getBufferSourceBytes(V);
for (let i = 0; i < kCShakeFunctionNames.length; i++) {
const functionName = kCShakeFunctionNames[i];
if (length !== functionName.length) continue;

let j = 0;
for (; j < length; j++) {
if (bytes[j] !== StringPrototypeCharCodeAt(functionName, j)) break;
}
if (j === length) return;
}
}

throw lazyDOMException(
'Unsupported CShakeParams functionName',
'NotSupportedError');
}

function validateCShakeCustomization(V) {
if (isFips && getBufferSourceByteLength(V) !== 0)
throw lazyDOMException(
'Unsupported CShakeParams customization',
'NotSupportedError');
validateMaxBufferLength(V, 'CShakeParams.customization', 512);
}

converters.RsaPssParams = createDictionaryConverter(
'RsaPssParams', [
dictAlgorithm,
Expand DownExpand Up@@ -433,7 +443,7 @@ converters.CShakeParams = createDictionaryConverter(
{
key: 'customization',
converter: converters.BufferSource,
validator: (V, opts) => validateMaxBufferLength(V, 'CShakeParams.customization', 512),
validator: validateCShakeCustomization,
},
],
]);
Expand DownExpand Up@@ -719,6 +729,7 @@ for (let i = 0; i < kKmacDictionaries.length; i++) {
key: 'length',
converter: (V, opts) =>
converters['unsigned long'](V, enforceRangeOptions(opts)),
validator: validateKmacKeyLength,
},
],
]);
Expand All@@ -732,6 +743,12 @@ converters.KmacParams = createDictionaryConverter(
key: 'outputLength',
converter: (V, opts) =>
converters['unsigned long'](V, enforceRangeOptions(opts)),
validator: (V) => {
if ((V === 0 || V % 8) && isFips)
throw lazyDOMException(
'Invalid KmacParams outputLength',
'NotSupportedError');
},
required: true,
},
{
Expand Down
5 changes: 5 additions & 0 deletions src/crypto/crypto_hash.cc
Original file line numberDiff line numberDiff line change
Expand Up@@ -827,6 +827,11 @@ Maybe<void> CShakeTraits::AdditionalConfig(
CShakeConfig* params) {
Environment* env = Environment::GetCurrent(args);

if (IsFipsEnabled()) {
THROW_ERR_CRYPTO_UNSUPPORTED_OPERATION(env);
return Nothing<void>();
}

CHECK(args[offset]->IsString()); // Algorithm name
Utf8Value algorithm_name(env->isolate(), args[offset]);
std::string_view algorithm_str = algorithm_name.ToStringView();
Expand Down
2 changes: 2 additions & 0 deletions src/crypto/crypto_kmac.cc
Original file line numberDiff line numberDiff line change
Expand Up@@ -151,6 +151,8 @@ bool DeriveBitsWithCShake(const KmacConfig& params,
const void* key_data,
size_t key_size,
ByteSource* out) {
if (IsFipsEnabled()) return false;

const size_t key_length_bytes = NumBitsToBytes(params.key_length);
if (key_size < key_length_bytes) return false;

Expand Down
10 changes: 10 additions & 0 deletions src/crypto/crypto_turboshake.cc
Original file line numberDiff line numberDiff line change
Expand Up@@ -428,6 +428,11 @@ Maybe<void> TurboShakeTraits::AdditionalConfig(
TurboShakeConfig* params) {
Environment* env = Environment::GetCurrent(args);

if (IsFipsEnabled()) {
THROW_ERR_CRYPTO_UNSUPPORTED_OPERATION(env);
return Nothing<void>();
}

// args[offset + 0] = algorithm name (string)
CHECK(args[offset]->IsString());
Utf8Value algorithm_name(env->isolate(), args[offset]);
Expand DownExpand Up@@ -535,6 +540,11 @@ Maybe<void> KangarooTwelveTraits::AdditionalConfig(
KangarooTwelveConfig* params) {
Environment* env = Environment::GetCurrent(args);

if (IsFipsEnabled()) {
THROW_ERR_CRYPTO_UNSUPPORTED_OPERATION(env);
return Nothing<void>();
}

// args[offset + 0] = algorithm name (string)
CHECK(args[offset]->IsString());
Utf8Value algorithm_name(env->isolate(), args[offset]);
Expand Down
8 changes: 6 additions & 2 deletions src/crypto/crypto_util.cc
Original file line numberDiff line numberDiff line change
Expand Up@@ -146,6 +146,11 @@ bool InitCryptoOnce(Isolate* isolate) {
// be part of a larger mutex for global OpenSSL state.
static Mutex fips_mutex;

bool IsFipsEnabled() {
Mutex::ScopedLock fips_lock(fips_mutex);
return ncrypto::isFipsEnabled();
}

void InitCryptoOnce() {
Mutex::ScopedLock lock(per_process::cli_options_mutex);
Mutex::ScopedLock fips_lock(fips_mutex);
Expand DownExpand Up@@ -223,8 +228,7 @@ void InitCryptoOnce() {

void GetFipsCrypto(const FunctionCallbackInfo<Value>& args) {
Mutex::ScopedLock lock(per_process::cli_options_mutex);
Mutex::ScopedLock fips_lock(fips_mutex);
args.GetReturnValue().Set(ncrypto::isFipsEnabled() ? 1 : 0);
args.GetReturnValue().Set(IsFipsEnabled() ? 1 : 0);
}

void SetFipsCrypto(const FunctionCallbackInfo<Value>& args) {
Expand Down
1 change: 1 addition & 0 deletions src/crypto/crypto_util.h
Original file line numberDiff line numberDiff line change
Expand Up@@ -66,6 +66,7 @@ constexpr T NumBitsToBytes(T bits) {
// what went wrong, or std::nullopt when there was nothing to do or the
// options were applied successfully.
std::optional<std::string> ProcessFipsOptions();
bool IsFipsEnabled();

bool InitCryptoOnce(v8::Isolate* isolate);
void InitCryptoOnce();
Expand Down
28 changes: 21 additions & 7 deletions test/parallel/test-crypto-key-objects-to-crypto-key.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -14,6 +14,7 @@ const {
} = require('crypto');
const { hasFIPS } = require('../common/crypto');
const { kSupportedAlgorithms } = require('internal/crypto/util');
const fips = hasFIPS();
const rejectsXCurves = hasFIPS(3, 5);

const hashes = Object.keys(kSupportedAlgorithms.digest).filter((name) => {
Expand DownExpand Up@@ -142,14 +143,24 @@ function macInvalid(algorithm, invalidLengthMessage, allowZeroKey = false) {
const key = createSecretKey(randomBytes(32));
const usages = ['sign', 'verify'];

if (allowZeroKey) {
if (allowZeroKey && !fips) {
const zeroKey = createSecretKey(Buffer.alloc(0))
.toCryptoKey(algorithm, true, usages);
assert.strictEqual(zeroKey.algorithm.length, 0);

const explicitZeroKey = createSecretKey(Buffer.alloc(0))
.toCryptoKey({ ...algorithm, length: 0 }, true, usages);
assert.strictEqual(explicitZeroKey.algorithm.length, 0);
} else if (allowZeroKey) {
for (const zeroAlgorithm of [algorithm, { ...algorithm, length: 0 }]) {
assert.throws(() => {
createSecretKey(Buffer.alloc(0))
.toCryptoKey(zeroAlgorithm, true, usages);
}, {
name: 'NotSupportedError',
message: 'Invalid key length',
});
}
} else {
assert.throws(() => {
createSecretKey(Buffer.alloc(0)).toCryptoKey(algorithm, true, usages);
Expand All@@ -164,12 +175,15 @@ function macInvalid(algorithm, invalidLengthMessage, allowZeroKey = false) {
message: 'Usages cannot be empty when importing a secret key.'
});

assert.throws(() => {
key.toCryptoKey({ ...algorithm, length: 0 }, true, usages);
}, {
name: 'DataError',
message: invalidLengthMessage,
});
assert.throws(
() => key.toCryptoKey({ ...algorithm, length: 0 }, true, usages),
allowZeroKey && fips ? {
name: 'NotSupportedError',
message: 'Invalid key length',
} : {
name: 'DataError',
message: invalidLengthMessage,
});
}

function hmacVectors() {
Expand Down
8 changes: 2 additions & 6 deletions test/parallel/test-webcrypto-derivekey.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -284,7 +284,7 @@ const fips4 = hasFIPS(4);
})().then(common.mustCall());
}

if (hasOpenSSL(3)) {
if (hasOpenSSL(3) && !hasFIPS()) {
(async () => {
const derivedKeyAlgorithm = { name: 'KMAC128', length: 0 };
const usages = ['sign'];
Expand DownExpand Up@@ -326,11 +326,7 @@ if (hasOpenSSL(3)) {
name: 'KMAC128',
outputLength: 256,
}, derived, new Uint8Array());
if (fips4) {
await assert.rejects(signature, { name: 'OperationError' });
} else {
assert.strictEqual((await signature).byteLength, 32);
}
assert.strictEqual((await signature).byteLength, 32);
}
})().then(common.mustCall());
}
Expand Down
5 changes: 5 additions & 0 deletions test/parallel/test-webcrypto-digest-turboshake-rfc.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,6 +5,11 @@ const common = require('../common');
if (!common.hasCrypto)
common.skip('missing crypto');

const { hasFIPS } = require('../common/crypto');

if (hasFIPS())
common.skip('TurboSHAKE and KangarooTwelve are not available in FIPS mode');

const assert = require('assert');
const { subtle } = globalThis.crypto;

Expand Down
5 changes: 5 additions & 0 deletions test/parallel/test-webcrypto-digest-turboshake.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,6 +5,11 @@ const common = require('../common');
if (!common.hasCrypto)
common.skip('missing crypto');

const { hasFIPS } = require('../common/crypto');

if (hasFIPS())
common.skip('TurboSHAKE and KangarooTwelve are not available in FIPS mode');

const assert = require('assert');
const { subtle } = globalThis.crypto;

Expand Down
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default"); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
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
4 changes: 4 additions & 0 deletions lib/internal/crypto/mac.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -20,6 +20,7 @@ const {
normalizeHashName,
numBitsToBytes,
truncateToBitLength,
validateKmacKeyLength,
} = require('internal/crypto/util');

const {
Expand DownExpand Up@@ -60,6 +61,9 @@ function normalizeKeyLength(handle, algorithm) {
length = algorithm.length;
}

if (algorithm.name === 'KMAC128' || algorithm.name === 'KMAC256')
validateKmacKeyLength(length);

return { handle, length };
}

Expand Down
14 changes: 14 additions & 0 deletions lib/internal/crypto/util.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -47,9 +47,12 @@ const {
EVP_PKEY_ML_KEM_1024,
kKeyVariantAES_OCB_128: hasAesOcbMode,
Argon2Job,
getFipsCrypto,
KmacJob,
} = internalBinding('crypto');

const isFips = getFipsCrypto() === 1;

const { getOptionValue } = require('internal/options');

const {
Expand DownExpand Up@@ -423,6 +426,8 @@ const conditionalAlgorithms = {
'Ed448': !process.features.openssl_is_boringssl,
'KMAC128': !!KmacJob,
'KMAC256': !!KmacJob,
'KT128': !isFips,
'KT256': !isFips,
'ML-DSA-44': !!EVP_PKEY_ML_DSA_44,
'ML-DSA-65': !!EVP_PKEY_ML_DSA_65,
'ML-DSA-87': !!EVP_PKEY_ML_DSA_87,
Expand All@@ -435,6 +440,8 @@ const conditionalAlgorithms = {
ArrayPrototypeIncludes(getHashes(), 'sha3-384'),
'SHA3-512': !process.features.openssl_is_boringssl ||
ArrayPrototypeIncludes(getHashes(), 'sha3-512'),
'TurboSHAKE128': !isFips,
'TurboSHAKE256': !isFips,
'X448': !process.features.openssl_is_boringssl,
};

Expand DownExpand Up@@ -579,6 +586,11 @@ function validateMaxBufferLength(data, name, max = kMaxBufferLength) {
}
}

function validateKmacKeyLength(length) {
if ((length < 32 || length % 8) && isFips)
throw lazyDOMException('Invalid key length', 'NotSupportedError');
}

/**
* Converts a bit length to the number of bytes needed to contain it.
* Non-byte lengths are rounded up to the next byte.
Expand DownExpand Up@@ -1097,6 +1109,7 @@ module.exports = {

kNamedCurveAliases,
kSupportedAlgorithms,
isFips,
normalizeAlgorithm,
normalizeHashName,
hasAnyNotIn,
Expand All@@ -1106,6 +1119,7 @@ module.exports = {
jobPromiseThen,
cleanupWebCryptoResult,
prepareWebCryptoResult,
validateKmacKeyLength,
validateMaxBufferLength,
numBitsToBytes,
truncateToBitLength,
Expand Down
51 changes: 34 additions & 17 deletions lib/internal/crypto/webidl.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,7 +9,6 @@ const {
StringPrototypeSplit,
StringPrototypeStartsWith,
StringPrototypeToLowerCase,
TypedArrayPrototypeGetLength,
} = primordials;

const {
Expand All@@ -27,8 +26,10 @@ const {
validateMaxBufferLength,
getBufferSourceByteLength,
getBufferSourceBytes,
isFips,
kNamedCurveAliases,
numBitsToBytes,
validateKmacKeyLength,
} = require('internal/crypto/util');
const {
converters: webidl,
Expand DownExpand Up@@ -252,30 +253,39 @@ function validateCShakeOutputLength(V) {
}
}

function bufferSourceEqualsAscii(V, string) {
if (getBufferSourceByteLength(V) !== string.length) return false;

const bytes = getBufferSourceBytes(V);
const length = TypedArrayPrototypeGetLength(bytes);
for (let i = 0; i < length; i++) {
if (bytes[i] !== StringPrototypeCharCodeAt(string, i)) return false;
}
return true;
}
const kCShakeFunctionNames = ['KMAC', 'TupleHash', 'ParallelHash'];

function validateCShakeFunctionName(V) {
if (getBufferSourceByteLength(V) === 0 ||
bufferSourceEqualsAscii(V, 'KMAC') ||
bufferSourceEqualsAscii(V, 'TupleHash') ||
bufferSourceEqualsAscii(V, 'ParallelHash')) {
return;
const length = getBufferSourceByteLength(V);
if (length === 0) return;

if (!isFips) {
const bytes = getBufferSourceBytes(V);
for (let i = 0; i < kCShakeFunctionNames.length; i++) {
const functionName = kCShakeFunctionNames[i];
if (length !== functionName.length) continue;

let j = 0;
for (; j < length; j++) {
if (bytes[j] !== StringPrototypeCharCodeAt(functionName, j)) break;
}
if (j === length) return;
}
}

throw lazyDOMException(
'Unsupported CShakeParams functionName',
'NotSupportedError');
}

function validateCShakeCustomization(V) {
if (isFips && getBufferSourceByteLength(V) !== 0)
throw lazyDOMException(
'Unsupported CShakeParams customization',
'NotSupportedError');
validateMaxBufferLength(V, 'CShakeParams.customization', 512);
}

converters.RsaPssParams = createDictionaryConverter(
'RsaPssParams', [
dictAlgorithm,
Expand DownExpand Up@@ -433,7 +443,7 @@ converters.CShakeParams = createDictionaryConverter(
{
key: 'customization',
converter: converters.BufferSource,
validator: (V, opts) => validateMaxBufferLength(V, 'CShakeParams.customization', 512),
validator: validateCShakeCustomization,
},
],
]);
Expand DownExpand Up@@ -719,6 +729,7 @@ for (let i = 0; i < kKmacDictionaries.length; i++) {
key: 'length',
converter: (V, opts) =>
converters['unsigned long'](V, enforceRangeOptions(opts)),
validator: validateKmacKeyLength,
},
],
]);
Expand All@@ -732,6 +743,12 @@ converters.KmacParams = createDictionaryConverter(
key: 'outputLength',
converter: (V, opts) =>
converters['unsigned long'](V, enforceRangeOptions(opts)),
validator: (V) => {
if ((V === 0 || V % 8) && isFips)
throw lazyDOMException(
'Invalid KmacParams outputLength',
'NotSupportedError');
},
required: true,
},
{
Expand Down
5 changes: 5 additions & 0 deletions src/crypto/crypto_hash.cc
Original file line numberDiff line numberDiff line change
Expand Up@@ -827,6 +827,11 @@ Maybe<void> CShakeTraits::AdditionalConfig(
CShakeConfig* params) {
Environment* env = Environment::GetCurrent(args);

if (IsFipsEnabled()) {
THROW_ERR_CRYPTO_UNSUPPORTED_OPERATION(env);
return Nothing<void>();
}

CHECK(args[offset]->IsString()); // Algorithm name
Utf8Value algorithm_name(env->isolate(), args[offset]);
std::string_view algorithm_str = algorithm_name.ToStringView();
Expand Down
2 changes: 2 additions & 0 deletions src/crypto/crypto_kmac.cc
Original file line numberDiff line numberDiff line change
Expand Up@@ -151,6 +151,8 @@ bool DeriveBitsWithCShake(const KmacConfig& params,
const void* key_data,
size_t key_size,
ByteSource* out) {
if (IsFipsEnabled()) return false;

const size_t key_length_bytes = NumBitsToBytes(params.key_length);
if (key_size < key_length_bytes) return false;

Expand Down
10 changes: 10 additions & 0 deletions src/crypto/crypto_turboshake.cc
Original file line numberDiff line numberDiff line change
Expand Up@@ -428,6 +428,11 @@ Maybe<void> TurboShakeTraits::AdditionalConfig(
TurboShakeConfig* params) {
Environment* env = Environment::GetCurrent(args);

if (IsFipsEnabled()) {
THROW_ERR_CRYPTO_UNSUPPORTED_OPERATION(env);
return Nothing<void>();
}

// args[offset + 0] = algorithm name (string)
CHECK(args[offset]->IsString());
Utf8Value algorithm_name(env->isolate(), args[offset]);
Expand DownExpand Up@@ -535,6 +540,11 @@ Maybe<void> KangarooTwelveTraits::AdditionalConfig(
KangarooTwelveConfig* params) {
Environment* env = Environment::GetCurrent(args);

if (IsFipsEnabled()) {
THROW_ERR_CRYPTO_UNSUPPORTED_OPERATION(env);
return Nothing<void>();
}

// args[offset + 0] = algorithm name (string)
CHECK(args[offset]->IsString());
Utf8Value algorithm_name(env->isolate(), args[offset]);
Expand Down
8 changes: 6 additions & 2 deletions src/crypto/crypto_util.cc
Original file line numberDiff line numberDiff line change
Expand Up@@ -146,6 +146,11 @@ bool InitCryptoOnce(Isolate* isolate) {
// be part of a larger mutex for global OpenSSL state.
static Mutex fips_mutex;

bool IsFipsEnabled() {
Mutex::ScopedLock fips_lock(fips_mutex);
return ncrypto::isFipsEnabled();
}

void InitCryptoOnce() {
Mutex::ScopedLock lock(per_process::cli_options_mutex);
Mutex::ScopedLock fips_lock(fips_mutex);
Expand DownExpand Up@@ -223,8 +228,7 @@ void InitCryptoOnce() {

void GetFipsCrypto(const FunctionCallbackInfo<Value>& args) {
Mutex::ScopedLock lock(per_process::cli_options_mutex);
Mutex::ScopedLock fips_lock(fips_mutex);
args.GetReturnValue().Set(ncrypto::isFipsEnabled() ? 1 : 0);
args.GetReturnValue().Set(IsFipsEnabled() ? 1 : 0);
}

void SetFipsCrypto(const FunctionCallbackInfo<Value>& args) {
Expand Down
1 change: 1 addition & 0 deletions src/crypto/crypto_util.h
Original file line numberDiff line numberDiff line change
Expand Up@@ -66,6 +66,7 @@ constexpr T NumBitsToBytes(T bits) {
// what went wrong, or std::nullopt when there was nothing to do or the
// options were applied successfully.
std::optional<std::string> ProcessFipsOptions();
bool IsFipsEnabled();

bool InitCryptoOnce(v8::Isolate* isolate);
void InitCryptoOnce();
Expand Down
28 changes: 21 additions & 7 deletions test/parallel/test-crypto-key-objects-to-crypto-key.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -14,6 +14,7 @@ const {
} = require('crypto');
const { hasFIPS } = require('../common/crypto');
const { kSupportedAlgorithms } = require('internal/crypto/util');
const fips = hasFIPS();
const rejectsXCurves = hasFIPS(3, 5);

const hashes = Object.keys(kSupportedAlgorithms.digest).filter((name) => {
Expand DownExpand Up@@ -142,14 +143,24 @@ function macInvalid(algorithm, invalidLengthMessage, allowZeroKey = false) {
const key = createSecretKey(randomBytes(32));
const usages = ['sign', 'verify'];

if (allowZeroKey) {
if (allowZeroKey && !fips) {
const zeroKey = createSecretKey(Buffer.alloc(0))
.toCryptoKey(algorithm, true, usages);
assert.strictEqual(zeroKey.algorithm.length, 0);

const explicitZeroKey = createSecretKey(Buffer.alloc(0))
.toCryptoKey({ ...algorithm, length: 0 }, true, usages);
assert.strictEqual(explicitZeroKey.algorithm.length, 0);
} else if (allowZeroKey) {
for (const zeroAlgorithm of [algorithm, { ...algorithm, length: 0 }]) {
assert.throws(() => {
createSecretKey(Buffer.alloc(0))
.toCryptoKey(zeroAlgorithm, true, usages);
}, {
name: 'NotSupportedError',
message: 'Invalid key length',
});
}
} else {
assert.throws(() => {
createSecretKey(Buffer.alloc(0)).toCryptoKey(algorithm, true, usages);
Expand All@@ -164,12 +175,15 @@ function macInvalid(algorithm, invalidLengthMessage, allowZeroKey = false) {
message: 'Usages cannot be empty when importing a secret key.'
});

assert.throws(() => {
key.toCryptoKey({ ...algorithm, length: 0 }, true, usages);
}, {
name: 'DataError',
message: invalidLengthMessage,
});
assert.throws(
() => key.toCryptoKey({ ...algorithm, length: 0 }, true, usages),
allowZeroKey && fips ? {
name: 'NotSupportedError',
message: 'Invalid key length',
} : {
name: 'DataError',
message: invalidLengthMessage,
});
}

function hmacVectors() {
Expand Down
8 changes: 2 additions & 6 deletions test/parallel/test-webcrypto-derivekey.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -284,7 +284,7 @@ const fips4 = hasFIPS(4);
})().then(common.mustCall());
}

if (hasOpenSSL(3)) {
if (hasOpenSSL(3) && !hasFIPS()) {
(async () => {
const derivedKeyAlgorithm = { name: 'KMAC128', length: 0 };
const usages = ['sign'];
Expand DownExpand Up@@ -326,11 +326,7 @@ if (hasOpenSSL(3)) {
name: 'KMAC128',
outputLength: 256,
}, derived, new Uint8Array());
if (fips4) {
await assert.rejects(signature, { name: 'OperationError' });
} else {
assert.strictEqual((await signature).byteLength, 32);
}
assert.strictEqual((await signature).byteLength, 32);
}
})().then(common.mustCall());
}
Expand Down
5 changes: 5 additions & 0 deletions test/parallel/test-webcrypto-digest-turboshake-rfc.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,6 +5,11 @@ const common = require('../common');
if (!common.hasCrypto)
common.skip('missing crypto');

const { hasFIPS } = require('../common/crypto');

if (hasFIPS())
common.skip('TurboSHAKE and KangarooTwelve are not available in FIPS mode');

const assert = require('assert');
const { subtle } = globalThis.crypto;

Expand Down
5 changes: 5 additions & 0 deletions test/parallel/test-webcrypto-digest-turboshake.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,6 +5,11 @@ const common = require('../common');
if (!common.hasCrypto)
common.skip('missing crypto');

const { hasFIPS } = require('../common/crypto');

if (hasFIPS())
common.skip('TurboSHAKE and KangarooTwelve are not available in FIPS mode');

const assert = require('assert');
const { subtle } = globalThis.crypto;

Expand Down
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers"); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
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
4 changes: 4 additions & 0 deletions lib/internal/crypto/mac.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -20,6 +20,7 @@ const {
normalizeHashName,
numBitsToBytes,
truncateToBitLength,
validateKmacKeyLength,
} = require('internal/crypto/util');

const {
Expand DownExpand Up@@ -60,6 +61,9 @@ function normalizeKeyLength(handle, algorithm) {
length = algorithm.length;
}

if (algorithm.name === 'KMAC128' || algorithm.name === 'KMAC256')
validateKmacKeyLength(length);

return { handle, length };
}

Expand Down
14 changes: 14 additions & 0 deletions lib/internal/crypto/util.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -47,9 +47,12 @@ const {
EVP_PKEY_ML_KEM_1024,
kKeyVariantAES_OCB_128: hasAesOcbMode,
Argon2Job,
getFipsCrypto,
KmacJob,
} = internalBinding('crypto');

const isFips = getFipsCrypto() === 1;

const { getOptionValue } = require('internal/options');

const {
Expand DownExpand Up@@ -423,6 +426,8 @@ const conditionalAlgorithms = {
'Ed448': !process.features.openssl_is_boringssl,
'KMAC128': !!KmacJob,
'KMAC256': !!KmacJob,
'KT128': !isFips,
'KT256': !isFips,
'ML-DSA-44': !!EVP_PKEY_ML_DSA_44,
'ML-DSA-65': !!EVP_PKEY_ML_DSA_65,
'ML-DSA-87': !!EVP_PKEY_ML_DSA_87,
Expand All@@ -435,6 +440,8 @@ const conditionalAlgorithms = {
ArrayPrototypeIncludes(getHashes(), 'sha3-384'),
'SHA3-512': !process.features.openssl_is_boringssl ||
ArrayPrototypeIncludes(getHashes(), 'sha3-512'),
'TurboSHAKE128': !isFips,
'TurboSHAKE256': !isFips,
'X448': !process.features.openssl_is_boringssl,
};

Expand DownExpand Up@@ -579,6 +586,11 @@ function validateMaxBufferLength(data, name, max = kMaxBufferLength) {
}
}

function validateKmacKeyLength(length) {
if ((length < 32 || length % 8) && isFips)
throw lazyDOMException('Invalid key length', 'NotSupportedError');
}

/**
* Converts a bit length to the number of bytes needed to contain it.
* Non-byte lengths are rounded up to the next byte.
Expand DownExpand Up@@ -1097,6 +1109,7 @@ module.exports = {

kNamedCurveAliases,
kSupportedAlgorithms,
isFips,
normalizeAlgorithm,
normalizeHashName,
hasAnyNotIn,
Expand All@@ -1106,6 +1119,7 @@ module.exports = {
jobPromiseThen,
cleanupWebCryptoResult,
prepareWebCryptoResult,
validateKmacKeyLength,
validateMaxBufferLength,
numBitsToBytes,
truncateToBitLength,
Expand Down
51 changes: 34 additions & 17 deletions lib/internal/crypto/webidl.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,7 +9,6 @@ const {
StringPrototypeSplit,
StringPrototypeStartsWith,
StringPrototypeToLowerCase,
TypedArrayPrototypeGetLength,
} = primordials;

const {
Expand All@@ -27,8 +26,10 @@ const {
validateMaxBufferLength,
getBufferSourceByteLength,
getBufferSourceBytes,
isFips,
kNamedCurveAliases,
numBitsToBytes,
validateKmacKeyLength,
} = require('internal/crypto/util');
const {
converters: webidl,
Expand DownExpand Up@@ -252,30 +253,39 @@ function validateCShakeOutputLength(V) {
}
}

function bufferSourceEqualsAscii(V, string) {
if (getBufferSourceByteLength(V) !== string.length) return false;

const bytes = getBufferSourceBytes(V);
const length = TypedArrayPrototypeGetLength(bytes);
for (let i = 0; i < length; i++) {
if (bytes[i] !== StringPrototypeCharCodeAt(string, i)) return false;
}
return true;
}
const kCShakeFunctionNames = ['KMAC', 'TupleHash', 'ParallelHash'];

function validateCShakeFunctionName(V) {
if (getBufferSourceByteLength(V) === 0 ||
bufferSourceEqualsAscii(V, 'KMAC') ||
bufferSourceEqualsAscii(V, 'TupleHash') ||
bufferSourceEqualsAscii(V, 'ParallelHash')) {
return;
const length = getBufferSourceByteLength(V);
if (length === 0) return;

if (!isFips) {
const bytes = getBufferSourceBytes(V);
for (let i = 0; i < kCShakeFunctionNames.length; i++) {
const functionName = kCShakeFunctionNames[i];
if (length !== functionName.length) continue;

let j = 0;
for (; j < length; j++) {
if (bytes[j] !== StringPrototypeCharCodeAt(functionName, j)) break;
}
if (j === length) return;
}
}

throw lazyDOMException(
'Unsupported CShakeParams functionName',
'NotSupportedError');
}

function validateCShakeCustomization(V) {
if (isFips && getBufferSourceByteLength(V) !== 0)
throw lazyDOMException(
'Unsupported CShakeParams customization',
'NotSupportedError');
validateMaxBufferLength(V, 'CShakeParams.customization', 512);
}

converters.RsaPssParams = createDictionaryConverter(
'RsaPssParams', [
dictAlgorithm,
Expand DownExpand Up@@ -433,7 +443,7 @@ converters.CShakeParams = createDictionaryConverter(
{
key: 'customization',
converter: converters.BufferSource,
validator: (V, opts) => validateMaxBufferLength(V, 'CShakeParams.customization', 512),
validator: validateCShakeCustomization,
},
],
]);
Expand DownExpand Up@@ -719,6 +729,7 @@ for (let i = 0; i < kKmacDictionaries.length; i++) {
key: 'length',
converter: (V, opts) =>
converters['unsigned long'](V, enforceRangeOptions(opts)),
validator: validateKmacKeyLength,
},
],
]);
Expand All@@ -732,6 +743,12 @@ converters.KmacParams = createDictionaryConverter(
key: 'outputLength',
converter: (V, opts) =>
converters['unsigned long'](V, enforceRangeOptions(opts)),
validator: (V) => {
if ((V === 0 || V % 8) && isFips)
throw lazyDOMException(
'Invalid KmacParams outputLength',
'NotSupportedError');
},
required: true,
},
{
Expand Down
5 changes: 5 additions & 0 deletions src/crypto/crypto_hash.cc
Original file line numberDiff line numberDiff line change
Expand Up@@ -827,6 +827,11 @@ Maybe<void> CShakeTraits::AdditionalConfig(
CShakeConfig* params) {
Environment* env = Environment::GetCurrent(args);

if (IsFipsEnabled()) {
THROW_ERR_CRYPTO_UNSUPPORTED_OPERATION(env);
return Nothing<void>();
}

CHECK(args[offset]->IsString()); // Algorithm name
Utf8Value algorithm_name(env->isolate(), args[offset]);
std::string_view algorithm_str = algorithm_name.ToStringView();
Expand Down
2 changes: 2 additions & 0 deletions src/crypto/crypto_kmac.cc
Original file line numberDiff line numberDiff line change
Expand Up@@ -151,6 +151,8 @@ bool DeriveBitsWithCShake(const KmacConfig& params,
const void* key_data,
size_t key_size,
ByteSource* out) {
if (IsFipsEnabled()) return false;

const size_t key_length_bytes = NumBitsToBytes(params.key_length);
if (key_size < key_length_bytes) return false;

Expand Down
10 changes: 10 additions & 0 deletions src/crypto/crypto_turboshake.cc
Original file line numberDiff line numberDiff line change
Expand Up@@ -428,6 +428,11 @@ Maybe<void> TurboShakeTraits::AdditionalConfig(
TurboShakeConfig* params) {
Environment* env = Environment::GetCurrent(args);

if (IsFipsEnabled()) {
THROW_ERR_CRYPTO_UNSUPPORTED_OPERATION(env);
return Nothing<void>();
}

// args[offset + 0] = algorithm name (string)
CHECK(args[offset]->IsString());
Utf8Value algorithm_name(env->isolate(), args[offset]);
Expand DownExpand Up@@ -535,6 +540,11 @@ Maybe<void> KangarooTwelveTraits::AdditionalConfig(
KangarooTwelveConfig* params) {
Environment* env = Environment::GetCurrent(args);

if (IsFipsEnabled()) {
THROW_ERR_CRYPTO_UNSUPPORTED_OPERATION(env);
return Nothing<void>();
}

// args[offset + 0] = algorithm name (string)
CHECK(args[offset]->IsString());
Utf8Value algorithm_name(env->isolate(), args[offset]);
Expand Down
8 changes: 6 additions & 2 deletions src/crypto/crypto_util.cc
Original file line numberDiff line numberDiff line change
Expand Up@@ -146,6 +146,11 @@ bool InitCryptoOnce(Isolate* isolate) {
// be part of a larger mutex for global OpenSSL state.
static Mutex fips_mutex;

bool IsFipsEnabled() {
Mutex::ScopedLock fips_lock(fips_mutex);
return ncrypto::isFipsEnabled();
}

void InitCryptoOnce() {
Mutex::ScopedLock lock(per_process::cli_options_mutex);
Mutex::ScopedLock fips_lock(fips_mutex);
Expand DownExpand Up@@ -223,8 +228,7 @@ void InitCryptoOnce() {

void GetFipsCrypto(const FunctionCallbackInfo<Value>& args) {
Mutex::ScopedLock lock(per_process::cli_options_mutex);
Mutex::ScopedLock fips_lock(fips_mutex);
args.GetReturnValue().Set(ncrypto::isFipsEnabled() ? 1 : 0);
args.GetReturnValue().Set(IsFipsEnabled() ? 1 : 0);
}

void SetFipsCrypto(const FunctionCallbackInfo<Value>& args) {
Expand Down
1 change: 1 addition & 0 deletions src/crypto/crypto_util.h
Original file line numberDiff line numberDiff line change
Expand Up@@ -66,6 +66,7 @@ constexpr T NumBitsToBytes(T bits) {
// what went wrong, or std::nullopt when there was nothing to do or the
// options were applied successfully.
std::optional<std::string> ProcessFipsOptions();
bool IsFipsEnabled();

bool InitCryptoOnce(v8::Isolate* isolate);
void InitCryptoOnce();
Expand Down
28 changes: 21 additions & 7 deletions test/parallel/test-crypto-key-objects-to-crypto-key.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -14,6 +14,7 @@ const {
} = require('crypto');
const { hasFIPS } = require('../common/crypto');
const { kSupportedAlgorithms } = require('internal/crypto/util');
const fips = hasFIPS();
const rejectsXCurves = hasFIPS(3, 5);

const hashes = Object.keys(kSupportedAlgorithms.digest).filter((name) => {
Expand DownExpand Up@@ -142,14 +143,24 @@ function macInvalid(algorithm, invalidLengthMessage, allowZeroKey = false) {
const key = createSecretKey(randomBytes(32));
const usages = ['sign', 'verify'];

if (allowZeroKey) {
if (allowZeroKey && !fips) {
const zeroKey = createSecretKey(Buffer.alloc(0))
.toCryptoKey(algorithm, true, usages);
assert.strictEqual(zeroKey.algorithm.length, 0);

const explicitZeroKey = createSecretKey(Buffer.alloc(0))
.toCryptoKey({ ...algorithm, length: 0 }, true, usages);
assert.strictEqual(explicitZeroKey.algorithm.length, 0);
} else if (allowZeroKey) {
for (const zeroAlgorithm of [algorithm, { ...algorithm, length: 0 }]) {
assert.throws(() => {
createSecretKey(Buffer.alloc(0))
.toCryptoKey(zeroAlgorithm, true, usages);
}, {
name: 'NotSupportedError',
message: 'Invalid key length',
});
}
} else {
assert.throws(() => {
createSecretKey(Buffer.alloc(0)).toCryptoKey(algorithm, true, usages);
Expand All@@ -164,12 +175,15 @@ function macInvalid(algorithm, invalidLengthMessage, allowZeroKey = false) {
message: 'Usages cannot be empty when importing a secret key.'
});

assert.throws(() => {
key.toCryptoKey({ ...algorithm, length: 0 }, true, usages);
}, {
name: 'DataError',
message: invalidLengthMessage,
});
assert.throws(
() => key.toCryptoKey({ ...algorithm, length: 0 }, true, usages),
allowZeroKey && fips ? {
name: 'NotSupportedError',
message: 'Invalid key length',
} : {
name: 'DataError',
message: invalidLengthMessage,
});
}

function hmacVectors() {
Expand Down
8 changes: 2 additions & 6 deletions test/parallel/test-webcrypto-derivekey.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -284,7 +284,7 @@ const fips4 = hasFIPS(4);
})().then(common.mustCall());
}

if (hasOpenSSL(3)) {
if (hasOpenSSL(3) && !hasFIPS()) {
(async () => {
const derivedKeyAlgorithm = { name: 'KMAC128', length: 0 };
const usages = ['sign'];
Expand DownExpand Up@@ -326,11 +326,7 @@ if (hasOpenSSL(3)) {
name: 'KMAC128',
outputLength: 256,
}, derived, new Uint8Array());
if (fips4) {
await assert.rejects(signature, { name: 'OperationError' });
} else {
assert.strictEqual((await signature).byteLength, 32);
}
assert.strictEqual((await signature).byteLength, 32);
}
})().then(common.mustCall());
}
Expand Down
5 changes: 5 additions & 0 deletions test/parallel/test-webcrypto-digest-turboshake-rfc.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,6 +5,11 @@ const common = require('../common');
if (!common.hasCrypto)
common.skip('missing crypto');

const { hasFIPS } = require('../common/crypto');

if (hasFIPS())
common.skip('TurboSHAKE and KangarooTwelve are not available in FIPS mode');

const assert = require('assert');
const { subtle } = globalThis.crypto;

Expand Down
5 changes: 5 additions & 0 deletions test/parallel/test-webcrypto-digest-turboshake.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,6 +5,11 @@ const common = require('../common');
if (!common.hasCrypto)
common.skip('missing crypto');

const { hasFIPS } = require('../common/crypto');

if (hasFIPS())
common.skip('TurboSHAKE and KangarooTwelve are not available in FIPS mode');

const assert = require('assert');
const { subtle } = globalThis.crypto;

Expand Down
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode"); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })();
Skip to content
Merged
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
4 changes: 4 additions & 0 deletions lib/internal/crypto/mac.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -20,6 +20,7 @@ const {
normalizeHashName,
numBitsToBytes,
truncateToBitLength,
validateKmacKeyLength,
} = require('internal/crypto/util');

const {
Expand DownExpand Up@@ -60,6 +61,9 @@ function normalizeKeyLength(handle, algorithm) {
length = algorithm.length;
}

if (algorithm.name === 'KMAC128' || algorithm.name === 'KMAC256')
validateKmacKeyLength(length);

return { handle, length };
}

Expand Down
14 changes: 14 additions & 0 deletions lib/internal/crypto/util.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -47,9 +47,12 @@ const {
EVP_PKEY_ML_KEM_1024,
kKeyVariantAES_OCB_128: hasAesOcbMode,
Argon2Job,
getFipsCrypto,
KmacJob,
} = internalBinding('crypto');

const isFips = getFipsCrypto() === 1;

const { getOptionValue } = require('internal/options');

const {
Expand DownExpand Up@@ -423,6 +426,8 @@ const conditionalAlgorithms = {
'Ed448': !process.features.openssl_is_boringssl,
'KMAC128': !!KmacJob,
'KMAC256': !!KmacJob,
'KT128': !isFips,
'KT256': !isFips,
'ML-DSA-44': !!EVP_PKEY_ML_DSA_44,
'ML-DSA-65': !!EVP_PKEY_ML_DSA_65,
'ML-DSA-87': !!EVP_PKEY_ML_DSA_87,
Expand All@@ -435,6 +440,8 @@ const conditionalAlgorithms = {
ArrayPrototypeIncludes(getHashes(), 'sha3-384'),
'SHA3-512': !process.features.openssl_is_boringssl ||
ArrayPrototypeIncludes(getHashes(), 'sha3-512'),
'TurboSHAKE128': !isFips,
'TurboSHAKE256': !isFips,
'X448': !process.features.openssl_is_boringssl,
};

Expand DownExpand Up@@ -579,6 +586,11 @@ function validateMaxBufferLength(data, name, max = kMaxBufferLength) {
}
}

function validateKmacKeyLength(length) {
if ((length < 32 || length % 8) && isFips)
throw lazyDOMException('Invalid key length', 'NotSupportedError');
}

/**
* Converts a bit length to the number of bytes needed to contain it.
* Non-byte lengths are rounded up to the next byte.
Expand DownExpand Up@@ -1097,6 +1109,7 @@ module.exports = {

kNamedCurveAliases,
kSupportedAlgorithms,
isFips,
normalizeAlgorithm,
normalizeHashName,
hasAnyNotIn,
Expand All@@ -1106,6 +1119,7 @@ module.exports = {
jobPromiseThen,
cleanupWebCryptoResult,
prepareWebCryptoResult,
validateKmacKeyLength,
validateMaxBufferLength,
numBitsToBytes,
truncateToBitLength,
Expand Down
51 changes: 34 additions & 17 deletions lib/internal/crypto/webidl.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,7 +9,6 @@ const {
StringPrototypeSplit,
StringPrototypeStartsWith,
StringPrototypeToLowerCase,
TypedArrayPrototypeGetLength,
} = primordials;

const {
Expand All@@ -27,8 +26,10 @@ const {
validateMaxBufferLength,
getBufferSourceByteLength,
getBufferSourceBytes,
isFips,
kNamedCurveAliases,
numBitsToBytes,
validateKmacKeyLength,
} = require('internal/crypto/util');
const {
converters: webidl,
Expand DownExpand Up@@ -252,30 +253,39 @@ function validateCShakeOutputLength(V) {
}
}

function bufferSourceEqualsAscii(V, string) {
if (getBufferSourceByteLength(V) !== string.length) return false;

const bytes = getBufferSourceBytes(V);
const length = TypedArrayPrototypeGetLength(bytes);
for (let i = 0; i < length; i++) {
if (bytes[i] !== StringPrototypeCharCodeAt(string, i)) return false;
}
return true;
}
const kCShakeFunctionNames = ['KMAC', 'TupleHash', 'ParallelHash'];

function validateCShakeFunctionName(V) {
if (getBufferSourceByteLength(V) === 0 ||
bufferSourceEqualsAscii(V, 'KMAC') ||
bufferSourceEqualsAscii(V, 'TupleHash') ||
bufferSourceEqualsAscii(V, 'ParallelHash')) {
return;
const length = getBufferSourceByteLength(V);
if (length === 0) return;

if (!isFips) {
const bytes = getBufferSourceBytes(V);
for (let i = 0; i < kCShakeFunctionNames.length; i++) {
const functionName = kCShakeFunctionNames[i];
if (length !== functionName.length) continue;

let j = 0;
for (; j < length; j++) {
if (bytes[j] !== StringPrototypeCharCodeAt(functionName, j)) break;
}
if (j === length) return;
}
}

throw lazyDOMException(
'Unsupported CShakeParams functionName',
'NotSupportedError');
}

function validateCShakeCustomization(V) {
if (isFips && getBufferSourceByteLength(V) !== 0)
throw lazyDOMException(
'Unsupported CShakeParams customization',
'NotSupportedError');
validateMaxBufferLength(V, 'CShakeParams.customization', 512);
}

converters.RsaPssParams = createDictionaryConverter(
'RsaPssParams', [
dictAlgorithm,
Expand DownExpand Up@@ -433,7 +443,7 @@ converters.CShakeParams = createDictionaryConverter(
{
key: 'customization',
converter: converters.BufferSource,
validator: (V, opts) => validateMaxBufferLength(V, 'CShakeParams.customization', 512),
validator: validateCShakeCustomization,
},
],
]);
Expand DownExpand Up@@ -719,6 +729,7 @@ for (let i = 0; i < kKmacDictionaries.length; i++) {
key: 'length',
converter: (V, opts) =>
converters['unsigned long'](V, enforceRangeOptions(opts)),
validator: validateKmacKeyLength,
},
],
]);
Expand All@@ -732,6 +743,12 @@ converters.KmacParams = createDictionaryConverter(
key: 'outputLength',
converter: (V, opts) =>
converters['unsigned long'](V, enforceRangeOptions(opts)),
validator: (V) => {
if ((V === 0 || V % 8) && isFips)
throw lazyDOMException(
'Invalid KmacParams outputLength',
'NotSupportedError');
},
required: true,
},
{
Expand Down
5 changes: 5 additions & 0 deletions src/crypto/crypto_hash.cc
Original file line numberDiff line numberDiff line change
Expand Up@@ -827,6 +827,11 @@ Maybe<void> CShakeTraits::AdditionalConfig(
CShakeConfig* params) {
Environment* env = Environment::GetCurrent(args);

if (IsFipsEnabled()) {
THROW_ERR_CRYPTO_UNSUPPORTED_OPERATION(env);
return Nothing<void>();
}

CHECK(args[offset]->IsString()); // Algorithm name
Utf8Value algorithm_name(env->isolate(), args[offset]);
std::string_view algorithm_str = algorithm_name.ToStringView();
Expand Down
2 changes: 2 additions & 0 deletions src/crypto/crypto_kmac.cc
Original file line numberDiff line numberDiff line change
Expand Up@@ -151,6 +151,8 @@ bool DeriveBitsWithCShake(const KmacConfig& params,
const void* key_data,
size_t key_size,
ByteSource* out) {
if (IsFipsEnabled()) return false;

const size_t key_length_bytes = NumBitsToBytes(params.key_length);
if (key_size < key_length_bytes) return false;

Expand Down
10 changes: 10 additions & 0 deletions src/crypto/crypto_turboshake.cc
Original file line numberDiff line numberDiff line change
Expand Up@@ -428,6 +428,11 @@ Maybe<void> TurboShakeTraits::AdditionalConfig(
TurboShakeConfig* params) {
Environment* env = Environment::GetCurrent(args);

if (IsFipsEnabled()) {
THROW_ERR_CRYPTO_UNSUPPORTED_OPERATION(env);
return Nothing<void>();
}

// args[offset + 0] = algorithm name (string)
CHECK(args[offset]->IsString());
Utf8Value algorithm_name(env->isolate(), args[offset]);
Expand DownExpand Up@@ -535,6 +540,11 @@ Maybe<void> KangarooTwelveTraits::AdditionalConfig(
KangarooTwelveConfig* params) {
Environment* env = Environment::GetCurrent(args);

if (IsFipsEnabled()) {
THROW_ERR_CRYPTO_UNSUPPORTED_OPERATION(env);
return Nothing<void>();
}

// args[offset + 0] = algorithm name (string)
CHECK(args[offset]->IsString());
Utf8Value algorithm_name(env->isolate(), args[offset]);
Expand Down
8 changes: 6 additions & 2 deletions src/crypto/crypto_util.cc
Original file line numberDiff line numberDiff line change
Expand Up@@ -146,6 +146,11 @@ bool InitCryptoOnce(Isolate* isolate) {
// be part of a larger mutex for global OpenSSL state.
static Mutex fips_mutex;

bool IsFipsEnabled() {
Mutex::ScopedLock fips_lock(fips_mutex);
return ncrypto::isFipsEnabled();
}

void InitCryptoOnce() {
Mutex::ScopedLock lock(per_process::cli_options_mutex);
Mutex::ScopedLock fips_lock(fips_mutex);
Expand DownExpand Up@@ -223,8 +228,7 @@ void InitCryptoOnce() {

void GetFipsCrypto(const FunctionCallbackInfo<Value>& args) {
Mutex::ScopedLock lock(per_process::cli_options_mutex);
Mutex::ScopedLock fips_lock(fips_mutex);
args.GetReturnValue().Set(ncrypto::isFipsEnabled() ? 1 : 0);
args.GetReturnValue().Set(IsFipsEnabled() ? 1 : 0);
}

void SetFipsCrypto(const FunctionCallbackInfo<Value>& args) {
Expand Down
1 change: 1 addition & 0 deletions src/crypto/crypto_util.h
Original file line numberDiff line numberDiff line change
Expand Up@@ -66,6 +66,7 @@ constexpr T NumBitsToBytes(T bits) {
// what went wrong, or std::nullopt when there was nothing to do or the
// options were applied successfully.
std::optional<std::string> ProcessFipsOptions();
bool IsFipsEnabled();

bool InitCryptoOnce(v8::Isolate* isolate);
void InitCryptoOnce();
Expand Down
28 changes: 21 additions & 7 deletions test/parallel/test-crypto-key-objects-to-crypto-key.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -14,6 +14,7 @@ const {
} = require('crypto');
const { hasFIPS } = require('../common/crypto');
const { kSupportedAlgorithms } = require('internal/crypto/util');
const fips = hasFIPS();
const rejectsXCurves = hasFIPS(3, 5);

const hashes = Object.keys(kSupportedAlgorithms.digest).filter((name) => {
Expand DownExpand Up@@ -142,14 +143,24 @@ function macInvalid(algorithm, invalidLengthMessage, allowZeroKey = false) {
const key = createSecretKey(randomBytes(32));
const usages = ['sign', 'verify'];

if (allowZeroKey) {
if (allowZeroKey && !fips) {
const zeroKey = createSecretKey(Buffer.alloc(0))
.toCryptoKey(algorithm, true, usages);
assert.strictEqual(zeroKey.algorithm.length, 0);

const explicitZeroKey = createSecretKey(Buffer.alloc(0))
.toCryptoKey({ ...algorithm, length: 0 }, true, usages);
assert.strictEqual(explicitZeroKey.algorithm.length, 0);
} else if (allowZeroKey) {
for (const zeroAlgorithm of [algorithm, { ...algorithm, length: 0 }]) {
assert.throws(() => {
createSecretKey(Buffer.alloc(0))
.toCryptoKey(zeroAlgorithm, true, usages);
}, {
name: 'NotSupportedError',
message: 'Invalid key length',
});
}
} else {
assert.throws(() => {
createSecretKey(Buffer.alloc(0)).toCryptoKey(algorithm, true, usages);
Expand All@@ -164,12 +175,15 @@ function macInvalid(algorithm, invalidLengthMessage, allowZeroKey = false) {
message: 'Usages cannot be empty when importing a secret key.'
});

assert.throws(() => {
key.toCryptoKey({ ...algorithm, length: 0 }, true, usages);
}, {
name: 'DataError',
message: invalidLengthMessage,
});
assert.throws(
() => key.toCryptoKey({ ...algorithm, length: 0 }, true, usages),
allowZeroKey && fips ? {
name: 'NotSupportedError',
message: 'Invalid key length',
} : {
name: 'DataError',
message: invalidLengthMessage,
});
}

function hmacVectors() {
Expand Down
8 changes: 2 additions & 6 deletions test/parallel/test-webcrypto-derivekey.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -284,7 +284,7 @@ const fips4 = hasFIPS(4);
})().then(common.mustCall());
}

if (hasOpenSSL(3)) {
if (hasOpenSSL(3) && !hasFIPS()) {
(async () => {
const derivedKeyAlgorithm = { name: 'KMAC128', length: 0 };
const usages = ['sign'];
Expand DownExpand Up@@ -326,11 +326,7 @@ if (hasOpenSSL(3)) {
name: 'KMAC128',
outputLength: 256,
}, derived, new Uint8Array());
if (fips4) {
await assert.rejects(signature, { name: 'OperationError' });
} else {
assert.strictEqual((await signature).byteLength, 32);
}
assert.strictEqual((await signature).byteLength, 32);
}
})().then(common.mustCall());
}
Expand Down
5 changes: 5 additions & 0 deletions test/parallel/test-webcrypto-digest-turboshake-rfc.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,6 +5,11 @@ const common = require('../common');
if (!common.hasCrypto)
common.skip('missing crypto');

const { hasFIPS } = require('../common/crypto');

if (hasFIPS())
common.skip('TurboSHAKE and KangarooTwelve are not available in FIPS mode');

const assert = require('assert');
const { subtle } = globalThis.crypto;

Expand Down
5 changes: 5 additions & 0 deletions test/parallel/test-webcrypto-digest-turboshake.js
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,6 +5,11 @@ const common = require('../common');
if (!common.hasCrypto)
common.skip('missing crypto');

const { hasFIPS } = require('../common/crypto');

if (hasFIPS())
common.skip('TurboSHAKE and KangarooTwelve are not available in FIPS mode');

const assert = require('assert');
const { subtle } = globalThis.crypto;

Expand Down
Loading
Loading