@@ -53,7 +53,6 @@ const { |
53 | 53 | getArrayBufferOrView, |
54 | 54 | getBlockSize, |
55 | 55 | hasAnyNotIn, |
56 | | - lazyRequire, |
57 | 56 | normalizeAlgorithm, |
58 | 57 | normalizeHashName, |
59 | 58 | validateMaxBufferLength, |
@@ -99,7 +98,7 @@ async function generateKey( |
99 | 98 | // Fall through |
100 | 99 | case 'RSA-OAEP': |
101 | 100 | resultType = 'CryptoKeyPair'; |
102 | | - result = await lazyRequire('internal/crypto/rsa') |
| 101 | + result = await require('internal/crypto/rsa') |
103 | 102 | .rsaKeyGenerate(algorithm, extractable, keyUsages); |
104 | 103 | break; |
105 | 104 | case 'Ed25519': |
@@ -110,19 +109,19 @@ async function generateKey( |
110 | 109 | // Fall through |
111 | 110 | case 'X448': |
112 | 111 | resultType = 'CryptoKeyPair'; |
113 | | - result = await lazyRequire('internal/crypto/cfrg') |
| 112 | + result = await require('internal/crypto/cfrg') |
114 | 113 | .cfrgGenerateKey(algorithm, extractable, keyUsages); |
115 | 114 | break; |
116 | 115 | case 'ECDSA': |
117 | 116 | // Fall through |
118 | 117 | case 'ECDH': |
119 | 118 | resultType = 'CryptoKeyPair'; |
120 | | - result = await lazyRequire('internal/crypto/ec') |
| 119 | + result = await require('internal/crypto/ec') |
121 | 120 | .ecGenerateKey(algorithm, extractable, keyUsages); |
122 | 121 | break; |
123 | 122 | case 'HMAC': |
124 | 123 | resultType = 'CryptoKey'; |
125 | | - result = await lazyRequire('internal/crypto/mac') |
| 124 | + result = await require('internal/crypto/mac') |
126 | 125 | .hmacGenerateKey(algorithm, extractable, keyUsages); |
127 | 126 | break; |
128 | 127 | case 'AES-CTR': |
@@ -133,7 +132,7 @@ async function generateKey( |
133 | 132 | // Fall through |
134 | 133 | case 'AES-KW': |
135 | 134 | resultType = 'CryptoKey'; |
136 | | - result = await lazyRequire('internal/crypto/aes') |
| 135 | + result = await require('internal/crypto/aes') |
137 | 136 | .aesGenerateKey(algorithm, extractable, keyUsages); |
138 | 137 | break; |
139 | 138 | default: |
@@ -172,13 +171,13 @@ async function deriveBits(algorithm, baseKey, length) { |
172 | 171 | case 'X448': |
173 | 172 | // Fall through |
174 | 173 | case 'ECDH': |
175 | | - return lazyRequire('internal/crypto/diffiehellman') |
| 174 | + return require('internal/crypto/diffiehellman') |
176 | 175 | .ecdhDeriveBits(algorithm, baseKey, length); |
177 | 176 | case 'HKDF': |
178 | | - return lazyRequire('internal/crypto/hkdf') |
| 177 | + return require('internal/crypto/hkdf') |
179 | 178 | .hkdfDeriveBits(algorithm, baseKey, length); |
180 | 179 | case 'PBKDF2': |
181 | | - return lazyRequire('internal/crypto/pbkdf2') |
| 180 | + return require('internal/crypto/pbkdf2') |
182 | 181 | .pbkdf2DeriveBits(algorithm, baseKey, length); |
183 | 182 | } |
184 | 183 | throw lazyDOMException('Unrecognized name.'); |
@@ -242,15 +241,15 @@ async function deriveKey( |
242 | 241 | case 'X448': |
243 | 242 | // Fall through |
244 | 243 | case 'ECDH': |
245 | | - bits = await lazyRequire('internal/crypto/diffiehellman') |
| 244 | + bits = await require('internal/crypto/diffiehellman') |
246 | 245 | .ecdhDeriveBits(algorithm, baseKey, length); |
247 | 246 | break; |
248 | 247 | case 'HKDF': |
249 | | - bits = await lazyRequire('internal/crypto/hkdf') |
| 248 | + bits = await require('internal/crypto/hkdf') |
250 | 249 | .hkdfDeriveBits(algorithm, baseKey, length); |
251 | 250 | break; |
252 | 251 | case 'PBKDF2': |
253 | | - bits = await lazyRequire('internal/crypto/pbkdf2') |
| 252 | + bits = await require('internal/crypto/pbkdf2') |
254 | 253 | .pbkdf2DeriveBits(algorithm, baseKey, length); |
255 | 254 | break; |
256 | 255 | default: |
@@ -272,15 +271,15 @@ async function exportKeySpki(key) { |
272 | 271 | // Fall through |
273 | 272 | case 'RSA-OAEP': |
274 | 273 | if (key.type === 'public') { |
275 | | - return lazyRequire('internal/crypto/rsa') |
| 274 | + return require('internal/crypto/rsa') |
276 | 275 | .rsaExportKey(key, kWebCryptoKeyFormatSPKI); |
277 | 276 | } |
278 | 277 | break; |
279 | 278 | case 'ECDSA': |
280 | 279 | // Fall through |
281 | 280 | case 'ECDH': |
282 | 281 | if (key.type === 'public') { |
283 | | - return lazyRequire('internal/crypto/ec') |
| 282 | + return require('internal/crypto/ec') |
284 | 283 | .ecExportKey(key, kWebCryptoKeyFormatSPKI); |
285 | 284 | } |
286 | 285 | break; |
@@ -292,7 +291,7 @@ async function exportKeySpki(key) { |
292 | 291 | // Fall through |
293 | 292 | case 'X448': |
294 | 293 | if (key.type === 'public') { |
295 | | - return lazyRequire('internal/crypto/cfrg') |
| 294 | + return require('internal/crypto/cfrg') |
296 | 295 | .cfrgExportKey(key, kWebCryptoKeyFormatSPKI); |
297 | 296 | } |
298 | 297 | break; |
@@ -311,15 +310,15 @@ async function exportKeyPkcs8(key) { |
311 | 310 | // Fall through |
312 | 311 | case 'RSA-OAEP': |
313 | 312 | if (key.type === 'private') { |
314 | | - return lazyRequire('internal/crypto/rsa') |
| 313 | + return require('internal/crypto/rsa') |
315 | 314 | .rsaExportKey(key, kWebCryptoKeyFormatPKCS8); |
316 | 315 | } |
317 | 316 | break; |
318 | 317 | case 'ECDSA': |
319 | 318 | // Fall through |
320 | 319 | case 'ECDH': |
321 | 320 | if (key.type === 'private') { |
322 | | - return lazyRequire('internal/crypto/ec') |
| 321 | + return require('internal/crypto/ec') |
323 | 322 | .ecExportKey(key, kWebCryptoKeyFormatPKCS8); |
324 | 323 | } |
325 | 324 | break; |
@@ -331,7 +330,7 @@ async function exportKeyPkcs8(key) { |
331 | 330 | // Fall through |
332 | 331 | case 'X448': |
333 | 332 | if (key.type === 'private') { |
334 | | - return lazyRequire('internal/crypto/cfrg') |
| 333 | + return require('internal/crypto/cfrg') |
335 | 334 | .cfrgExportKey(key, kWebCryptoKeyFormatPKCS8); |
336 | 335 | } |
337 | 336 | break; |
@@ -348,7 +347,7 @@ async function exportKeyRaw(key) { |
348 | 347 | // Fall through |
349 | 348 | case 'ECDH': |
350 | 349 | if (key.type === 'public') { |
351 | | - return lazyRequire('internal/crypto/ec') |
| 350 | + return require('internal/crypto/ec') |
352 | 351 | .ecExportKey(key, kWebCryptoKeyFormatRaw); |
353 | 352 | } |
354 | 353 | break; |
@@ -360,7 +359,7 @@ async function exportKeyRaw(key) { |
360 | 359 | // Fall through |
361 | 360 | case 'X448': |
362 | 361 | if (key.type === 'public') { |
363 | | - return lazyRequire('internal/crypto/cfrg') |
| 362 | + return require('internal/crypto/cfrg') |
364 | 363 | .cfrgExportKey(key, kWebCryptoKeyFormatRaw); |
365 | 364 | } |
366 | 365 | break; |
@@ -425,7 +424,7 @@ async function exportKeyJWK(key) { |
425 | 424 | case 'AES-GCM': |
426 | 425 | // Fall through |
427 | 426 | case 'AES-KW': |
428 | | - jwk.alg = lazyRequire('internal/crypto/aes') |
| 427 | + jwk.alg = require('internal/crypto/aes') |
429 | 428 | .getAlgorithmName(key.algorithm.name, key.algorithm.length); |
430 | 429 | return jwk; |
431 | 430 | case 'HMAC': |
@@ -524,12 +523,12 @@ async function importKey( |
524 | 523 | case 'RSA-PSS': |
525 | 524 | // Fall through |
526 | 525 | case 'RSA-OAEP': |
527 | | - return lazyRequire('internal/crypto/rsa') |
| 526 | + return require('internal/crypto/rsa') |
528 | 527 | .rsaImportKey(format, keyData, algorithm, extractable, keyUsages); |
529 | 528 | case 'ECDSA': |
530 | 529 | // Fall through |
531 | 530 | case 'ECDH': |
532 | | - return lazyRequire('internal/crypto/ec') |
| 531 | + return require('internal/crypto/ec') |
533 | 532 | .ecImportKey(format, keyData, algorithm, extractable, keyUsages); |
534 | 533 | case 'Ed25519': |
535 | 534 | // Fall through |
@@ -538,10 +537,10 @@ async function importKey( |
538 | 537 | case 'X25519': |
539 | 538 | // Fall through |
540 | 539 | case 'X448': |
541 | | - return lazyRequire('internal/crypto/cfrg') |
| 540 | + return require('internal/crypto/cfrg') |
542 | 541 | .cfrgImportKey(format, keyData, algorithm, extractable, keyUsages); |
543 | 542 | case 'HMAC': |
544 | | - return lazyRequire('internal/crypto/mac') |
| 543 | + return require('internal/crypto/mac') |
545 | 544 | .hmacImportKey(format, keyData, algorithm, extractable, keyUsages); |
546 | 545 | case 'AES-CTR': |
547 | 546 | // Fall through |
@@ -550,7 +549,7 @@ async function importKey( |
550 | 549 | case 'AES-GCM': |
551 | 550 | // Fall through |
552 | 551 | case 'AES-KW': |
553 | | - return lazyRequire('internal/crypto/aes') |
| 552 | + return require('internal/crypto/aes') |
554 | 553 | .aesImportKey(algorithm, format, keyData, extractable, keyUsages); |
555 | 554 | case 'HKDF': |
556 | 555 | // Fall through |
@@ -650,19 +649,19 @@ function signVerify(algorithm, key, data, signature) { |
650 | 649 | case 'RSA-PSS': |
651 | 650 | // Fall through |
652 | 651 | case 'RSASSA-PKCS1-v1_5': |
653 | | - return lazyRequire('internal/crypto/rsa') |
| 652 | + return require('internal/crypto/rsa') |
654 | 653 | .rsaSignVerify(key, data, algorithm, signature); |
655 | 654 | case 'ECDSA': |
656 | | - return lazyRequire('internal/crypto/ec') |
| 655 | + return require('internal/crypto/ec') |
657 | 656 | .ecdsaSignVerify(key, data, algorithm, signature); |
658 | 657 | case 'Ed25519': |
659 | 658 | // Fall through |
660 | 659 | case 'Ed448': |
661 | 660 | // Fall through |
662 | | - return lazyRequire('internal/crypto/cfrg') |
| 661 | + return require('internal/crypto/cfrg') |
663 | 662 | .eddsaSignVerify(key, data, algorithm, signature); |
664 | 663 | case 'HMAC': |
665 | | - return lazyRequire('internal/crypto/mac') |
| 664 | + return require('internal/crypto/mac') |
666 | 665 | .hmacSignVerify(key, data, algorithm, signature); |
667 | 666 | } |
668 | 667 | throw lazyDOMException('Unrecognized named.', 'NotSupportedError'); |
@@ -705,18 +704,18 @@ async function cipherOrWrap(mode, algorithm, key, data, op) { |
705 | 704 |
|
706 | 705 | switch (algorithm.name) { |
707 | 706 | case 'RSA-OAEP': |
708 | | - return lazyRequire('internal/crypto/rsa') |
| 707 | + return require('internal/crypto/rsa') |
709 | 708 | .rsaCipher(mode, key, data, algorithm); |
710 | 709 | case 'AES-CTR': |
711 | 710 | // Fall through |
712 | 711 | case 'AES-CBC': |
713 | 712 | // Fall through |
714 | 713 | case 'AES-GCM': |
715 | | - return lazyRequire('internal/crypto/aes') |
| 714 | + return require('internal/crypto/aes') |
716 | 715 | .aesCipher(mode, key, data, algorithm); |
717 | 716 | case 'AES-KW': |
718 | 717 | if (op === 'wrapKey' || op === 'unwrapKey') { |
719 | | - return lazyRequire('internal/crypto/aes') |
| 718 | + return require('internal/crypto/aes') |
720 | 719 | .aesCipher(mode, key, data, algorithm); |
721 | 720 | } |
722 | 721 | } |
|