Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 1 addition & 25 deletions lib/internal/crypto/webidl.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ const {

const {
lazyDOMException,
kEmptyObject,
} = require('internal/util');
const { CryptoKey } = require('internal/crypto/webcrypto');
const {
Expand Down Expand Up @@ -133,30 +132,7 @@ const dictAlgorithm = [
converters.Algorithm = createDictionaryConverter(
'Algorithm', dictAlgorithm);

// TODO(panva): Reject resizable backing stores in a semver-major with:
// converters.BigInteger = webidl.Uint8Array;
converters.BigInteger = (V, opts = kEmptyObject) => {
return webidl.Uint8Array(V, {
prefix: opts.prefix,
context: opts.context,
code: opts.code,
allowResizable: true,
allowShared: false,
});
};

// TODO(panva): Reject resizable backing stores in a semver-major by
// removing this altogether.
converters.BufferSource = (V, opts = kEmptyObject) => {
return webidl.BufferSource(V, {
prefix: opts.prefix,
context: opts.context,
code: opts.code,
allowResizable: opts.allowResizable === undefined ?
true : opts.allowResizable,
allowShared: opts.allowShared,
});
};
converters.BigInteger = webidl.Uint8Array;

const dictRsaKeyGenParams = [
{
Expand Down
38 changes: 16 additions & 22 deletions test/parallel/test-webcrypto-webidl.js
Original file line number Diff line number Diff line change
Expand Up @@ -178,8 +178,13 @@ function assertJsonWebKey(actual, expected) {
const resizable = new ArrayBuffer(8, { maxByteLength: 16 });
const view = new Uint8Array(resizable);

// TODO(panva): Reject resizable backing stores in a semver-major
assert.deepStrictEqual(converters.BigInteger(view), view);
const resizableError = {
name: 'TypeError',
code: 'ERR_INVALID_ARG_TYPE',
message: `${prefix}: ${context} is backed by a resizable ` +
'ArrayBuffer, which is not allowed.',
};
assert.throws(() => converters.BigInteger(view, opts), resizableError);
}
}

Expand Down Expand Up @@ -223,32 +228,21 @@ function assertJsonWebKey(actual, expected) {
const view = new Uint8Array(resizable);
const dataView = new DataView(resizable);

// TODO(panva): Reject resizable backing stores in a semver-major by
// removing the crypto/webidl BufferSource override.
assert.deepStrictEqual(converters.BufferSource(resizable), resizable);
assert.deepStrictEqual(converters.BufferSource(view), view);
assert.deepStrictEqual(converters.BufferSource(dataView), dataView);
const resizableError = {
name: 'TypeError',
code: 'ERR_INVALID_ARG_TYPE',
message: `${prefix}: ${context} is backed by a resizable ` +
'ArrayBuffer, which is not allowed.',
};
assert.throws(() => converters.BufferSource(resizable, {
__proto__: null,
...opts,
allowResizable: false,
}), resizableError);
assert.throws(() => converters.BufferSource(view, {
__proto__: null,
...opts,
allowResizable: false,
}), resizableError);
assert.throws(() => converters.BufferSource(dataView, {
__proto__: null,
...opts,
allowResizable: false,
}), resizableError);
assert.throws(
() => converters.BufferSource(resizable, opts),
resizableError);
assert.throws(
() => converters.BufferSource(view, opts),
resizableError);
assert.throws(
() => converters.BufferSource(dataView, opts),
resizableError);
}
}

Expand Down
Loading