Skip to content

Commit c036258

Browse files
panvajuanarbol
authored andcommitted
crypto: cleanup webcrypto jwk code
PR-URL: #42562 Reviewed-By: Tobias Nießen <tniessen@tnie.de> Reviewed-By: Benjamin Gruenbaum <benjamingr@gmail.com> Reviewed-By: Zeyu Yang <himself65@outlook.com> Reviewed-By: Akhil Marsonya <akhil.marsonya27@gmail.com> Reviewed-By: Luigi Pinca <luigipinca@gmail.com> Reviewed-By: Rich Trott <rtrott@gmail.com>
1 parent 44ac5e8 commit c036258

2 files changed

Lines changed: 0 additions & 56 deletions

File tree

‎lib/internal/crypto/dsa.js‎

Lines changed: 0 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,9 @@ const {
77

88
const{
99
DSAKeyExportJob,
10-
KeyObjectHandle,
1110
SignJob,
1211
kCryptoJobAsync,
1312
kSigEncDER,
14-
kKeyTypePrivate,
1513
kSignJobModeSign,
1614
kSignJobModeVerify,
1715
}=internalBinding('crypto');
@@ -29,8 +27,6 @@ const {
2927

3028
const{
3129
InternalCryptoKey,
32-
PrivateKeyObject,
33-
PublicKeyObject,
3430
createPrivateKey,
3531
createPublicKey,
3632
isKeyObject,
@@ -45,7 +41,6 @@ const {
4541
hasAnyNotIn,
4642
jobPromise,
4743
normalizeHashName,
48-
validateKeyOps,
4944
kKeyObject,
5045
kHandle,
5146
}=require('internal/crypto/util');
@@ -178,52 +173,6 @@ async function dsaImportKey(
178173
});
179174
break;
180175
}
181-
case'jwk': {
182-
if(keyData==null||typeofkeyData!=='object')
183-
throwlazyDOMException('Invalid JWK keyData','DataError');
184-
185-
verifyAcceptableDsaKeyUse(
186-
algorithm.name,
187-
keyData.x!==undefined ? 'private' : 'public',
188-
usagesSet);
189-
190-
if(keyData.kty!=='DSA')
191-
throwlazyDOMException('Invalid key type','DataError');
192-
193-
if(usagesSet.size>0&&
194-
keyData.use!==undefined&&
195-
keyData.use!=='sig'){
196-
throwlazyDOMException('Invalid use type','DataError');
197-
}
198-
199-
validateKeyOps(keyData.key_ops,usagesSet);
200-
201-
if(keyData.ext!==undefined&&
202-
keyData.ext===false&&
203-
extractable===true){
204-
throwlazyDOMException('JWK is not extractable','DataError');
205-
}
206-
207-
if(keyData.alg!==undefined){
208-
if(typeofkeyData.alg!=='string')
209-
throwlazyDOMException('Invalid alg','DataError');
210-
consthash=
211-
normalizeHashName(keyData.alg,normalizeHashName.kContextWebCrypto);
212-
if(hash!==algorithm.hash.name)
213-
throwlazyDOMException('Hash mismatch','DataError');
214-
}
215-
216-
consthandle=newKeyObjectHandle();
217-
consttype=handle.initJwk(keyData);
218-
if(type===undefined)
219-
throwlazyDOMException('Invalid JWK keyData','DataError');
220-
221-
keyObject=type===kKeyTypePrivate ?
222-
newPrivateKeyObject(handle) :
223-
newPublicKeyObject(handle);
224-
225-
break;
226-
}
227176
default:
228177
throwlazyDOMException(
229178
`Unable to import DSA key with format ${format}`,

‎lib/internal/crypto/webcrypto.js‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -403,11 +403,6 @@ async function exportKeyJWK(key) {
403403
key.algorithm.hash.name,
404404
normalizeHashName.kContextJwkHmac);
405405
returnjwk;
406-
case'NODE-DSA':
407-
jwk.alg=normalizeHashName(
408-
key.algorithm.hash.name,
409-
normalizeHashName.kContextJwkDsa);
410-
returnjwk;
411406
case'NODE-ED25519':
412407
// Fall through
413408
case'NODE-ED448':

0 commit comments

Comments
 (0)