Mirroristas/openpgpjs
2
0
Fork 0
mirror of https://github.com/openpgpjs/openpgpjs.git synced 2025-11-24 06:25:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Internal: use transformAsync over transform with async callbacks

Browse Source
This commit is contained in:
larabr 2025-11-13 15:13:28 +01:00
parent afa7e083de
commit 1e2b8290d8
No known key found for this signature in database
GPG Key ID: 2A4BEC40729185DD
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/crypto/cipherMode/cfb.js
View File

@ -24,7 +24,7 @@
import { cfb as nobleAesCfb, unsafe as nobleAesHelpers } from '@noble/ciphers/aes'; import { cfb as nobleAesCfb, unsafe as nobleAesHelpers } from '@noble/ciphers/aes';
import { transform as streamTransform } from '@openpgp/web-stream-tools'; import { transform as streamTransform, transformAsync as streamTransformAsync } from '@openpgp/web-stream-tools';
import util from '../../util'; import util from '../../util';
import enums from '../../enums'; import enums from '../../enums';
import { getLegacyCipher, getCipherParams } from '../cipher'; import { getLegacyCipher, getCipherParams } from '../cipher';
@ -351,10 +351,10 @@ class NobleStreamProcessor {
async function aesEncrypt(algo, key, pt, iv) { async function aesEncrypt(algo, key, pt, iv) {
if (webCrypto && await WebCryptoEncryptor.isSupported(algo)) { // Chromium does not implement AES with 192-bit keys if (webCrypto && await WebCryptoEncryptor.isSupported(algo)) { // Chromium does not implement AES with 192-bit keys
const cfb = new WebCryptoEncryptor(algo, key, iv); const cfb = new WebCryptoEncryptor(algo, key, iv);
return util.isStream(pt) ? streamTransform(pt, value => cfb.encryptChunk(value), () => cfb.finish()) : cfb.encrypt(pt); return util.isStream(pt) ? streamTransformAsync(pt, value => cfb.encryptChunk(value), () => cfb.finish()) : cfb.encrypt(pt);
} else if (util.isStream(pt)) { // async callbacks are not accepted by streamTransform unless the input is a stream } else if (util.isStream(pt)) { // async callbacks are not accepted by streamTransform unless the input is a stream
const cfb = new NobleStreamProcessor(true, algo, key, iv); const cfb = new NobleStreamProcessor(true, algo, key, iv);
return streamTransform(pt, value => cfb.processChunk(value), () => cfb.finish()); return streamTransformAsync(pt, value => cfb.processChunk(value), () => cfb.finish());
} }
return nobleAesCfb(key, iv).encrypt(pt); return nobleAesCfb(key, iv).encrypt(pt);
} }
@ -362,7 +362,7 @@ async function aesEncrypt(algo, key, pt, iv) {
function aesDecrypt(algo, key, ct, iv) { function aesDecrypt(algo, key, ct, iv) {
if (util.isStream(ct)) { if (util.isStream(ct)) {
const cfb = new NobleStreamProcessor(false, algo, key, iv); const cfb = new NobleStreamProcessor(false, algo, key, iv);
return streamTransform(ct, value => cfb.processChunk(value), () => cfb.finish()); return streamTransformAsync(ct, value => cfb.processChunk(value), () => cfb.finish());
} }
return nobleAesCfb(key, iv).decrypt(ct); return nobleAesCfb(key, iv).decrypt(ct);
} }