Introduce zipx encryption handling for bzip2 compressed zip files

Author: GeorgH93

Makefile.am

@@ -1121,6 +1121,7 @@ libarchive_test_EXTRA_DIST=\
 	libarchive/test/test_read_format_zip_winzip_aes128.zip.uu \
 	libarchive/test/test_read_format_zip_winzip_aes256.zip.uu \
 	libarchive/test/test_read_format_zip_winzip_aes256_large.zip.uu \
+	libarchive/test/test_read_format_zip_winzip_aes256_large_bzip2.zip.uu \
 	libarchive/test/test_read_format_zip_winzip_aes256_large_lzma.zip.uu \
 	libarchive/test/test_read_format_zip_winzip_aes256_large_ppmd.zip.uu \
 	libarchive/test/test_read_format_zip_winzip_aes256_large_xz.zip.uu \

libarchive/archive_read_support_format_zip.c

@@ -2542,6 +2542,7 @@ zip_read_data_zipx_bzip2(struct archive_read *a, const void **buff,
 	struct zip *zip = (struct zip *)(a->format->data);
 	ssize_t bytes_avail = 0, in_bytes, to_consume;
 	const void *compressed_buff;
+	const void *sp;
 	int r;
 	uint64_t total_out;
 
@@ -2574,6 +2575,9 @@ zip_read_data_zipx_bzip2(struct archive_read *a, const void **buff,
 		return (ARCHIVE_FATAL);
 	}
 
+	zip_read_decrypt(zip, compressed_buff, in_bytes,
+	    &compressed_buff, &in_bytes, &sp);
+
 	/* Setup buffer boundaries. */
 	zip->bzstream.next_in = (char*)(uintptr_t) compressed_buff;
 	zip->bzstream.avail_in = (uint32_t)in_bytes;
@@ -2624,6 +2628,14 @@ zip_read_data_zipx_bzip2(struct archive_read *a, const void **buff,
 	zip->entry_compressed_bytes_read += to_consume;
 	zip->entry_uncompressed_bytes_read += total_out;
 
+	zip_read_decrypt_update(zip, to_consume, sp);
+
+	if (zip->end_of_entry && zip->hctx_valid) {
+		r = check_authentication_code(a, NULL);
+		if (r != ARCHIVE_OK)
+			return r;
+	}
+
 	/* Give libarchive its due. */
 	*size = (size_t)total_out;
 	*buff = zip->uncompressed_buffer;