ignore password if the entry is not encrypted

gildas-lormeau · Jul 14, 2022 · ac3b092 · ac3b092
1 parent 36a68bc
commit ac3b092
Showing 1 changed file with 2 additions and 4 deletions.
diff --git a/lib/core/streams/zip-entry-stream.js b/lib/core/streams/zip-entry-stream.js
@@ -52,11 +52,10 @@ class DeflateStream extends TransformStream {
 
 	constructor(codecConstructor, options, { chunkSize }, ...strategies) {
 		super({}, ...strategies);
-		const { compressed, useCompressionStream, password, passwordVerification, encryptionStrength, zipCrypto, signed } = options;
+		const { compressed, encrypted, useCompressionStream, password, passwordVerification, encryptionStrength, zipCrypto, signed } = options;
 		const stream = this;
 		let crc32Stream, encryptionStream;
 		let readable = filterEmptyChunks(super.readable);
-		const encrypted = Boolean(password);
 		if ((!encrypted || zipCrypto) && signed) {
 			[readable, crc32Stream] = readable.tee();
 			crc32Stream = crc32Stream.pipeThrough(new Crc32Stream());
@@ -99,11 +98,10 @@ class InflateStream extends TransformStream {
 
 	constructor(codecConstructor, options, { chunkSize }, ...strategies) {
 		super({}, ...strategies);
-		const { zipCrypto, password, passwordVerification, signed, encryptionStrength, compressed, useCompressionStream } = options;
+		const { zipCrypto, encrypted, password, passwordVerification, signed, encryptionStrength, compressed, useCompressionStream } = options;
 		const stream = this;
 		let crc32Stream, decryptionStream;
 		let readable = filterEmptyChunks(super.readable);
-		const encrypted = Boolean(password);
 		if (encrypted) {
 			if (zipCrypto) {
 				readable = readable.pipeThrough(new ZipCryptoDecryptionStream(password, passwordVerification));