FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

crypto: align verifyOneShot accepted types · nodejs/node@ad98b46 · GitHub

/ node Public

Commit ad98b46

Browse files
Anshikakalpana
authored and
aduh95
committed
crypto: align verifyOneShot accepted types
Signed-off-by: anshikakalpana <anshikajain196872@gmail.com> PR-URL: #63280 Fixes: #62903 Reviewed-By: Filip Skokan <panva.ip@gmail.com> Reviewed-By: Antoine du Hamel <duhamelantoine1995@gmail.com>
1 parent 2a6e605 commit ad98b46

3 files changed

Lines changed: 42 additions & 20 deletions

File tree

‎doc/api/crypto.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6132,7 +6132,7 @@ changes:
61326132
<!--lint disable maximum-line-length remark-lint-->
61336133

61346134
* `algorithm` {string | null | undefined}
6135-
* `data` {ArrayBuffer|Buffer|TypedArray|DataView}
6135+
* `data` {ArrayBuffer|Buffer|SharedArrayBuffer|TypedArray|DataView|string}
61366136
* `key` {Object|string|ArrayBuffer|Buffer|TypedArray|DataView|KeyObject|CryptoKey}
61376137
* `callback` {Function}
61386138
* `err` {Error}
@@ -6264,9 +6264,9 @@ changes:
62646264
<!--lint disable maximum-line-length remark-lint-->
62656265

62666266
* `algorithm` {string|null|undefined}
6267-
* `data` {ArrayBuffer| Buffer|TypedArray|DataView}
6267+
* `data` {ArrayBuffer|Buffer|SharedArrayBuffer|TypedArray|DataView|string}
62686268
* `key` {Object|string|ArrayBuffer|Buffer|TypedArray|DataView|KeyObject|CryptoKey}
6269-
* `signature` {ArrayBuffer|Buffer|TypedArray|DataView}
6269+
* `signature` {ArrayBuffer|Buffer|SharedArrayBuffer|TypedArray|DataView}
62706270
* `callback` {Function}
62716271
* `err` {Error}
62726272
* `result` {boolean}

‎lib/internal/crypto/sig.js‎

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -265,14 +265,6 @@ function verifyOneShot(algorithm, data, key, signature, callback) {
265265

266266
data = getArrayBufferOrView(data, 'data');
267267

268-
if (!isArrayBufferView(data)) {
269-
throw new ERR_INVALID_ARG_TYPE(
270-
'data',
271-
['Buffer', 'TypedArray', 'DataView'],
272-
data,
273-
);
274-
}
275-
276268
// Options specific to RSA
277269
const rsaPadding = getPadding(key);
278270
const pssSaltLength = getSaltLength(key);
@@ -283,13 +275,7 @@ function verifyOneShot(algorithm, data, key, signature, callback) {
283275
// Options specific to Ed448 and ML-DSA
284276
const context = getContext(key);
285277

286-
if (!isArrayBufferView(signature)) {
287-
throw new ERR_INVALID_ARG_TYPE(
288-
'signature',
289-
['Buffer', 'TypedArray', 'DataView'],
290-
signature,
291-
);
292-
}
278+
signature = getArrayBufferOrView(signature, 'signature');
293279

294280
const {
295281
data: keyData,

‎test/parallel/test-crypto-sign-verify.js‎

Lines changed: 38 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -619,8 +619,8 @@ if (hasOpenSSL(3, 2)) {
619619
assert.throws(() => crypto.sign(null, data, input), errObj);
620620
assert.throws(() => crypto.verify(null, data, input, sig), errObj);
621621

622-
errObj.message = 'The "signature" argument must be an instance of ' +
623-
'Buffer, TypedArray, or DataView.' +
622+
errObj.message = 'The "signature" argument must be of type string or an instance of ' +
623+
'ArrayBuffer, Buffer, TypedArray, or DataView.' +
624624
common.invalidArgTypeHelper(input);
625625
assert.throws(() => crypto.verify(null, data, 'test', input), errObj);
626626
});
@@ -1019,3 +1019,39 @@ if (!process.features.openssl_is_boringssl) {
10191019
message: /key\.format/,
10201020
});
10211021
}
1022+
1023+
// crypto.verify accepts ArrayBuffer and SharedArrayBuffer for data and signature
1024+
{
1025+
const { privateKey, publicKey } = crypto.generateKeyPairSync('rsa', { modulusLength: 2048 });
1026+
const dataBuffer = Buffer.from('Hello world');
1027+
1028+
// Data as ArrayBuffer
1029+
{
1030+
const ab = dataBuffer.buffer.slice(dataBuffer.byteOffset, dataBuffer.byteOffset + dataBuffer.byteLength);
1031+
const sig = crypto.sign('SHA256', dataBuffer, privateKey);
1032+
assert.strictEqual(crypto.verify('SHA256', ab, publicKey, sig), true);
1033+
}
1034+
1035+
// Data as SharedArrayBuffer
1036+
{
1037+
const sab = new SharedArrayBuffer(dataBuffer.length);
1038+
new Uint8Array(sab).set(dataBuffer);
1039+
const sig = crypto.sign('SHA256', dataBuffer, privateKey);
1040+
assert.strictEqual(crypto.verify('SHA256', sab, publicKey, sig), true);
1041+
}
1042+
1043+
// Signature as ArrayBuffer
1044+
{
1045+
const sig = crypto.sign('SHA256', dataBuffer, privateKey);
1046+
const sigAB = sig.buffer.slice(sig.byteOffset, sig.byteOffset + sig.byteLength);
1047+
assert.strictEqual(crypto.verify('SHA256', dataBuffer, publicKey, sigAB), true);
1048+
}
1049+
1050+
// Signature as SharedArrayBuffer
1051+
{
1052+
const sig = crypto.sign('SHA256', dataBuffer, privateKey);
1053+
const sigSAB = new SharedArrayBuffer(sig.length);
1054+
new Uint8Array(sigSAB).set(sig);
1055+
assert.strictEqual(crypto.verify('SHA256', dataBuffer, publicKey, sigSAB), true);
1056+
}
1057+
}

0 commit comments

Comments
 (0)
Back | FazBrowse Home | New Git URL