GV

GeezerVison

The World Wide Web, restored to 800 pixels of glory.

Home|About|Gaming cabinet|Archives|How it works|Starter sites

On this site

  • Sign in
  • ActionsCI/CD and automation
  • CodespacesCloud development environments
  • All Features
  • Documentation
  • Training
  • Certifications
  • Build with Copilot
  • Customize Copilot
  • Integrations
  • Trending repos
  • GitHub Sponsors
  • Developer articles
  • Enterprises

This view

  • Original page
  • New address

GeezerVison is showing github.com — crypto: fix webcrypto HMAC "get key length" in deriveKey and generateKey · nodejs/node@57f507f

File tree

Expand file treeCollapse file tree
Open diff view settings
Filter options
  • lib/internal/crypto
    • mac.js
    • util.js
    • webcrypto.js
  • test/parallel
    • test-webcrypto-derivekey.js
    • test-webcrypto-keygen.js
Expand file treeCollapse file tree
Open diff view settings
Collapse file

‎lib/internal/crypto/mac.js‎

Copy file name to clipboardExpand all lines: lib/internal/crypto/mac.js
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ const {
1414
} = internalBinding('crypto');
1515

1616
const {
17-
getHashLength,
17+
getBlockSize,
1818
hasAnyNotIn,
1919
jobPromise,
2020
normalizeHashName,
@@ -54,7 +54,7 @@ async function hmacGenerateKey(algorithm, extractable, keyUsages) {
5454
throw new ERR_MISSING_OPTION('algorithm.hash');
5555

5656
if (length === undefined)
57-
length = getHashLength(hash.name);
57+
length = getBlockSize(hash.name);
5858

5959
validateBitLength(length, 'algorithm.length', true);
6060

Collapse file

‎lib/internal/crypto/util.js‎

Copy file name to clipboardExpand all lines: lib/internal/crypto/util.js
+6-6Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -340,12 +340,12 @@ function getUsagesUnion(usageSet, ...usages) {
340340
return newset;
341341
}
342342

343-
function getHashLength(name) {
343+
function getBlockSize(name) {
344344
switch (name) {
345-
case 'SHA-1': return 160;
346-
case 'SHA-256': return 256;
347-
case 'SHA-384': return 384;
348-
case 'SHA-512': return 512;
345+
case 'SHA-1': return 512;
346+
case 'SHA-256': return 512;
347+
case 'SHA-384': return 1024;
348+
case 'SHA-512': return 1024;
349349
}
350350
}
351351

@@ -430,8 +430,8 @@ module.exports = {
430430
validateMaxBufferLength,
431431
bigIntArrayToUnsignedBigInt,
432432
bigIntArrayToUnsignedInt,
433+
getBlockSize,
433434
getStringOption,
434435
getUsagesUnion,
435-
getHashLength,
436436
secureHeapUsed,
437437
};
Collapse file

‎lib/internal/crypto/webcrypto.js‎

Copy file name to clipboardExpand all lines: lib/internal/crypto/webcrypto.js
+2-10Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@ const {
5151

5252
const {
5353
getArrayBufferOrView,
54+
getBlockSize,
5455
hasAnyNotIn,
5556
lazyRequire,
5657
normalizeAlgorithm,
@@ -195,16 +196,7 @@ function getKeyLength({ name, length, hash }) {
195196
return length;
196197
case 'HMAC':
197198
if (length === undefined) {
198-
switch (hash?.name) {
199-
case 'SHA-1':
200-
return 160;
201-
case 'SHA-256':
202-
return 256;
203-
case 'SHA-384':
204-
return 384;
205-
case 'SHA-512':
206-
return 512;
207-
}
199+
return getBlockSize(hash?.name);
208200
}
209201

210202
if (typeof length === 'number' && length !== 0) {
Collapse file

‎test/parallel/test-webcrypto-derivekey.js‎

Copy file name to clipboardExpand all lines: test/parallel/test-webcrypto-derivekey.js
+27-4Lines changed: 27 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -124,10 +124,11 @@ const { webcrypto: { subtle }, KeyObject } = require('crypto');
124124
const vectors = [
125125
['PBKDF2', 'deriveKey', 528],
126126
['HKDF', 'deriveKey', 528],
127-
[{ name: 'HMAC', hash: 'SHA-1' }, 'sign', 160],
128-
[{ name: 'HMAC', hash: 'SHA-256' }, 'sign', 256],
129-
[{ name: 'HMAC', hash: 'SHA-384' }, 'sign', 384],
130-
[{ name: 'HMAC', hash: 'SHA-512' }, 'sign', 512],
127+
[{ name: 'HMAC', hash: 'SHA-1' }, 'sign', 512],
128+
[{ name: 'HMAC', hash: 'SHA-256' }, 'sign', 512],
129+
// Not long enough secret generated by ECDH
130+
// [{ name: 'HMAC', hash: 'SHA-384' }, 'sign', 1024],
131+
// [{ name: 'HMAC', hash: 'SHA-512' }, 'sign', 1024],
131132
];
132133

133134
(async () => {
@@ -151,6 +152,28 @@ const { webcrypto: { subtle }, KeyObject } = require('crypto');
151152
})().then(common.mustCall());
152153
}
153154

155+
{
156+
const vectors = [
157+
[{ name: 'HMAC', hash: 'SHA-1' }, 'sign', 512],
158+
[{ name: 'HMAC', hash: 'SHA-256' }, 'sign', 512],
159+
[{ name: 'HMAC', hash: 'SHA-384' }, 'sign', 1024],
160+
[{ name: 'HMAC', hash: 'SHA-512' }, 'sign', 1024],
161+
];
162+
163+
(async () => {
164+
for (const [derivedKeyAlgorithm, usage, expected] of vectors) {
165+
const derived = await subtle.deriveKey(
166+
{ name: 'PBKDF2', salt: new Uint8Array([]), hash: 'SHA-256', iterations: 20 },
167+
await subtle.importKey('raw', new Uint8Array([]), { name: 'PBKDF2' }, false, ['deriveKey']),
168+
derivedKeyAlgorithm,
169+
false,
170+
[usage]);
171+
172+
assert.strictEqual(derived.algorithm.length, expected);
173+
}
174+
})().then(common.mustCall());
175+
}
176+
154177
// Test X25519 and X448 key derivation
155178
{
156179
async function test(name) {
Collapse file

‎test/parallel/test-webcrypto-keygen.js‎

Copy file name to clipboardExpand all lines: test/parallel/test-webcrypto-keygen.js
+4-4Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -551,10 +551,10 @@ const vectors = {
551551

552552
if (length === undefined) {
553553
switch (hash) {
554-
case 'SHA-1': length = 160; break;
555-
case 'SHA-256': length = 256; break;
556-
case 'SHA-384': length = 384; break;
557-
case 'SHA-512': length = 512; break;
554+
case 'SHA-1': length = 512; break;
555+
case 'SHA-256': length = 512; break;
556+
case 'SHA-384': length = 1024; break;
557+
case 'SHA-512': length = 1024; break;
558558
}
559559
}
560560

0 commit comments

Comments
0 (0)
You are visitor 01402503 — GeezerVison does not store the pages you look up.
Best viewed with Netscape Navigator 4.7 or Internet Explorer 6 at 800×600. No cookies required.