Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Commit 94cd600

Browse filesBrowse files
panvapanva
authored
crypto: fix DOMException name for non-extractable key error
PR-URL: #60830 Reviewed-By: Chemi Atlow <chemi@atlow.co.il> Reviewed-By: Luigi Pinca <luigipinca@gmail.com> Reviewed-By: LiviaMedeiros <livia@cirno.name> Reviewed-By: Colin Ihrig <cjihrig@gmail.com> Reviewed-By: Tobias Nießen <tniessen@tnie.de> Reviewed-By: Antoine du Hamel <duhamelantoine1995@gmail.com>
1 parent 209a4fe commit 94cd600
Copy full SHA for 94cd600

6 files changed

+45-23Lines changed: 45 additions & 23 deletions
Expand file treeCollapse file tree
Open diff view settings
Collapse file

‎lib/internal/crypto/webcrypto.js‎

Copy file name to clipboardExpand all lines: lib/internal/crypto/webcrypto.js
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -676,7 +676,7 @@ async function exportKey(format, key) {
676676
}
677677

678678
if (!key[kExtractable])
679-
throw lazyDOMException('key is not extractable', 'InvalidAccessException');
679+
throw lazyDOMException('key is not extractable', 'InvalidAccessError');
680680

681681
let result;
682682
switch (format) {
Collapse file

‎test/parallel/test-webcrypto-export-import-cfrg.js‎

Copy file name to clipboardExpand all lines: test/parallel/test-webcrypto-export-import-cfrg.js
+8-4Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,8 @@ async function testImportSpki({ name, publicUsages }, extractable) {
134134
} else {
135135
await assert.rejects(
136136
subtle.exportKey('spki', key), {
137-
message: /key is not extractable/
137+
message: /key is not extractable/,
138+
name: 'InvalidAccessError',
138139
});
139140
}
140141

@@ -172,7 +173,8 @@ async function testImportPkcs8({ name, privateUsages }, extractable) {
172173
} else {
173174
await assert.rejects(
174175
subtle.exportKey('pkcs8', key), {
175-
message: /key is not extractable/
176+
message: /key is not extractable/,
177+
name: 'InvalidAccessError',
176178
});
177179
}
178180

@@ -303,11 +305,13 @@ async function testImportJwk({ name, publicUsages, privateUsages }, extractable)
303305
} else {
304306
await assert.rejects(
305307
subtle.exportKey('jwk', publicKey), {
306-
message: /key is not extractable/
308+
message: /key is not extractable/,
309+
name: 'InvalidAccessError',
307310
});
308311
await assert.rejects(
309312
subtle.exportKey('jwk', privateKey), {
310-
message: /key is not extractable/
313+
message: /key is not extractable/,
314+
name: 'InvalidAccessError',
311315
});
312316
}
313317

Collapse file

‎test/parallel/test-webcrypto-export-import-ec.js‎

Copy file name to clipboardExpand all lines: test/parallel/test-webcrypto-export-import-ec.js
+8-4Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,8 @@ async function testImportSpki({ name, publicUsages }, namedCurve, extractable) {
123123
} else {
124124
await assert.rejects(
125125
subtle.exportKey('spki', key), {
126-
message: /key is not extractable/
126+
message: /key is not extractable/,
127+
name: 'InvalidAccessError',
127128
});
128129
}
129130

@@ -165,7 +166,8 @@ async function testImportPkcs8(
165166
} else {
166167
await assert.rejects(
167168
subtle.exportKey('pkcs8', key), {
168-
message: /key is not extractable/
169+
message: /key is not extractable/,
170+
name: 'InvalidAccessError',
169171
});
170172
}
171173

@@ -270,11 +272,13 @@ async function testImportJwk(
270272
} else {
271273
await assert.rejects(
272274
subtle.exportKey('jwk', publicKey), {
273-
message: /key is not extractable/
275+
message: /key is not extractable/,
276+
name: 'InvalidAccessError',
274277
});
275278
await assert.rejects(
276279
subtle.exportKey('jwk', privateKey), {
277-
message: /key is not extractable/
280+
message: /key is not extractable/,
281+
name: 'InvalidAccessError',
278282
});
279283
}
280284

Collapse file

‎test/parallel/test-webcrypto-export-import-ml-dsa.js‎

Copy file name to clipboardExpand all lines: test/parallel/test-webcrypto-export-import-ml-dsa.js
+12-6Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,8 @@ async function testImportSpki({ name, publicUsages }, extractable) {
106106
} else {
107107
await assert.rejects(
108108
subtle.exportKey('spki', key), {
109-
message: /key is not extractable/
109+
message: /key is not extractable/,
110+
name: 'InvalidAccessError',
110111
});
111112
}
112113

@@ -144,7 +145,8 @@ async function testImportPkcs8({ name, privateUsages }, extractable) {
144145
} else {
145146
await assert.rejects(
146147
subtle.exportKey('pkcs8', key), {
147-
message: /key is not extractable/
148+
message: /key is not extractable/,
149+
name: 'InvalidAccessError',
148150
});
149151
}
150152

@@ -181,7 +183,8 @@ async function testImportPkcs8SeedOnly({ name, privateUsages }, extractable) {
181183
} else {
182184
await assert.rejects(
183185
subtle.exportKey('pkcs8', key), {
184-
message: /key is not extractable/
186+
message: /key is not extractable/,
187+
name: 'InvalidAccessError',
185188
});
186189
}
187190

@@ -219,7 +222,8 @@ async function testImportPkcs8PrivOnly({ name, privateUsages }, extractable) {
219222
} else {
220223
await assert.rejects(
221224
subtle.exportKey('pkcs8', key), {
222-
message: /key is not extractable/
225+
message: /key is not extractable/,
226+
name: 'InvalidAccessError',
223227
});
224228
}
225229

@@ -299,11 +303,13 @@ async function testImportJwk({ name, publicUsages, privateUsages }, extractable)
299303
} else {
300304
await assert.rejects(
301305
subtle.exportKey('jwk', publicKey), {
302-
message: /key is not extractable/
306+
message: /key is not extractable/,
307+
name: 'InvalidAccessError',
303308
});
304309
await assert.rejects(
305310
subtle.exportKey('jwk', privateKey), {
306-
message: /key is not extractable/
311+
message: /key is not extractable/,
312+
name: 'InvalidAccessError',
307313
});
308314
}
309315

Collapse file

‎test/parallel/test-webcrypto-export-import-ml-kem.js‎

Copy file name to clipboardExpand all lines: test/parallel/test-webcrypto-export-import-ml-kem.js
+8-4Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,8 @@ async function testImportSpki({ name, publicUsages }, extractable) {
8989
} else {
9090
await assert.rejects(
9191
subtle.exportKey('spki', key), {
92-
message: /key is not extractable/
92+
message: /key is not extractable/,
93+
name: 'InvalidAccessError',
9394
});
9495
}
9596

@@ -127,7 +128,8 @@ async function testImportPkcs8({ name, privateUsages }, extractable) {
127128
} else {
128129
await assert.rejects(
129130
subtle.exportKey('pkcs8', key), {
130-
message: /key is not extractable/
131+
message: /key is not extractable/,
132+
name: 'InvalidAccessError',
131133
});
132134
}
133135

@@ -164,7 +166,8 @@ async function testImportPkcs8SeedOnly({ name, privateUsages }, extractable) {
164166
} else {
165167
await assert.rejects(
166168
subtle.exportKey('pkcs8', key), {
167-
message: /key is not extractable/
169+
message: /key is not extractable/,
170+
name: 'InvalidAccessError',
168171
});
169172
}
170173

@@ -202,7 +205,8 @@ async function testImportPkcs8PrivOnly({ name, privateUsages }, extractable) {
202205
} else {
203206
await assert.rejects(
204207
subtle.exportKey('pkcs8', key), {
205-
message: /key is not extractable/
208+
message: /key is not extractable/,
209+
name: 'InvalidAccessError',
206210
});
207211
}
208212

Collapse file

‎test/parallel/test-webcrypto-export-import-rsa.js‎

Copy file name to clipboardExpand all lines: test/parallel/test-webcrypto-export-import-rsa.js
+8-4Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -336,7 +336,8 @@ async function testImportSpki({ name, publicUsages }, size, hash, extractable) {
336336
} else {
337337
await assert.rejects(
338338
subtle.exportKey('spki', key), {
339-
message: /key is not extractable/
339+
message: /key is not extractable/,
340+
name: 'InvalidAccessError',
340341
});
341342
}
342343
}
@@ -372,7 +373,8 @@ async function testImportPkcs8(
372373
} else {
373374
await assert.rejects(
374375
subtle.exportKey('pkcs8', key), {
375-
message: /key is not extractable/
376+
message: /key is not extractable/,
377+
name: 'InvalidAccessError',
376378
});
377379
}
378380

@@ -479,11 +481,13 @@ async function testImportJwk(
479481
} else {
480482
await assert.rejects(
481483
subtle.exportKey('jwk', publicKey), {
482-
message: /key is not extractable/
484+
message: /key is not extractable/,
485+
name: 'InvalidAccessError',
483486
});
484487
await assert.rejects(
485488
subtle.exportKey('jwk', privateKey), {
486-
message: /key is not extractable/
489+
message: /key is not extractable/,
490+
name: 'InvalidAccessError',
487491
});
488492
}
489493

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.