@@ -326,13 +326,13 @@ converters.JsonWebKey = createDictionaryConverter(
326326 simpleDomStringKey ( 'dp' ) ,
327327 simpleDomStringKey ( 'dq' ) ,
328328 simpleDomStringKey ( 'qi' ) ,
329- simpleDomStringKey ( 'pub' ) ,
330- simpleDomStringKey ( 'priv' ) ,
331329 {
332330 key : 'oth' ,
333331 converter : converters [ 'sequence<RsaOtherPrimesInfo>' ] ,
334332 } ,
335333 simpleDomStringKey ( 'k' ) ,
334+ simpleDomStringKey ( 'pub' ) ,
335+ simpleDomStringKey ( 'priv' ) ,
336336 ] ) ;
337337
338338converters . HkdfParams = createDictionaryConverter (
@@ -392,9 +392,8 @@ converters.Pbkdf2Params = createDictionaryConverter(
392392 dictAlgorithm ,
393393 [
394394 {
395- key : 'hash' ,
396- converter : converters . HashAlgorithmIdentifier ,
397- validator : ( V , dict ) => ensureSHA ( V , 'Pbkdf2Params' ) ,
395+ key : 'salt' ,
396+ converter : converters . BufferSource ,
398397 required : true ,
399398 } ,
400399 {
@@ -408,8 +407,9 @@ converters.Pbkdf2Params = createDictionaryConverter(
408407 required : true ,
409408 } ,
410409 {
411- key : 'salt' ,
412- converter : converters . BufferSource ,
410+ key : 'hash' ,
411+ converter : converters . HashAlgorithmIdentifier ,
412+ validator : ( V , dict ) => ensureSHA ( V , 'Pbkdf2Params' ) ,
413413 required : true ,
414414 } ,
415415 ] ,
@@ -468,6 +468,11 @@ converters.AeadParams = createDictionaryConverter(
468468 } ,
469469 required : true ,
470470 } ,
471+ {
472+ key : 'additionalData' ,
473+ converter : converters . BufferSource ,
474+ validator : ( V , dict ) => validateMaxBufferLength ( V , 'algorithm.additionalData' ) ,
475+ } ,
471476 {
472477 key : 'tagLength' ,
473478 converter : ( V , opts ) =>
@@ -498,11 +503,6 @@ converters.AeadParams = createDictionaryConverter(
498503 }
499504 } ,
500505 } ,
501- {
502- key : 'additionalData' ,
503- converter : converters . BufferSource ,
504- validator : ( V , dict ) => validateMaxBufferLength ( V , 'algorithm.additionalData' ) ,
505- } ,
506506 ] ,
507507 ] ) ;
508508
0 commit comments