Skip to content

Commit 94cd600

Browse 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

6 files changed

Lines changed: 45 additions & 23 deletions

‎lib/internal/crypto/webcrypto.js‎

Lines 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-
throwlazyDOMException('key is not extractable','InvalidAccessException');
679+
throwlazyDOMException('key is not extractable','InvalidAccessError');
680680

681681
letresult;
682682
switch(format){

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

Lines 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
awaitassert.rejects(
136136
subtle.exportKey('spki',key),{
137-
message: /keyisnotextractable/
137+
message: /keyisnotextractable/,
138+
name: 'InvalidAccessError',
138139
});
139140
}
140141

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

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

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

Lines 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
awaitassert.rejects(
125125
subtle.exportKey('spki',key),{
126-
message: /keyisnotextractable/
126+
message: /keyisnotextractable/,
127+
name: 'InvalidAccessError',
127128
});
128129
}
129130

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

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

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

Lines 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
awaitassert.rejects(
108108
subtle.exportKey('spki',key),{
109-
message: /keyisnotextractable/
109+
message: /keyisnotextractable/,
110+
name: 'InvalidAccessError',
110111
});
111112
}
112113

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

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

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

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

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

Lines 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
awaitassert.rejects(
9191
subtle.exportKey('spki',key),{
92-
message: /keyisnotextractable/
92+
message: /keyisnotextractable/,
93+
name: 'InvalidAccessError',
9394
});
9495
}
9596

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

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

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

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

Lines 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
awaitassert.rejects(
338338
subtle.exportKey('spki',key),{
339-
message: /keyisnotextractable/
339+
message: /keyisnotextractable/,
340+
name: 'InvalidAccessError',
340341
});
341342
}
342343
}
@@ -372,7 +373,8 @@ async function testImportPkcs8(
372373
}else{
373374
awaitassert.rejects(
374375
subtle.exportKey('pkcs8',key),{
375-
message: /keyisnotextractable/
376+
message: /keyisnotextractable/,
377+
name: 'InvalidAccessError',
376378
});
377379
}
378380

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

0 commit comments

Comments
 (0)