Skip to content

Commit b66d136

Browse files
authored
Merge pull request libarchive#2865 from GeorgH93/read_zipx_encryption
Add support for reading encrypted zipx formats (bzip2, lzma, ppmd, xz, zstd)
2 parents 10bd4da + b266da1 commit b66d136

10 files changed

Lines changed: 9459 additions & 221 deletions

Makefile.am

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -601,6 +601,7 @@ libarchive_test_SOURCES= \
601601
libarchive/test/test_read_format_zip_winzip_aes.c \
602602
libarchive/test/test_read_format_zip_winzip_aes_large.c \
603603
libarchive/test/test_read_format_zip_zip64.c \
604+
libarchive/test/test_read_format_zip_zipx_encrypted.c \
604605
libarchive/test/test_read_format_zip_zipx_lzma_oom.c \
605606
libarchive/test/test_read_format_zip_with_invalid_traditional_eocd.c \
606607
libarchive/test/test_read_large.c \
@@ -1122,6 +1123,11 @@ libarchive_test_EXTRA_DIST=\
11221123
libarchive/test/test_read_format_zip_winzip_aes128.zip.uu \
11231124
libarchive/test/test_read_format_zip_winzip_aes256.zip.uu \
11241125
libarchive/test/test_read_format_zip_winzip_aes256_large.zip.uu \
1126+
libarchive/test/test_read_format_zip_winzip_aes256_large_bzip2.zip.uu \
1127+
libarchive/test/test_read_format_zip_winzip_aes256_large_lzma.zip.uu \
1128+
libarchive/test/test_read_format_zip_winzip_aes256_large_ppmd.zip.uu \
1129+
libarchive/test/test_read_format_zip_winzip_aes256_large_xz.zip.uu \
1130+
libarchive/test/test_read_format_zip_winzip_aes256_large_zstd.zip.uu \
11251131
libarchive/test/test_read_format_zip_winzip_aes256_stored.zip.uu \
11261132
libarchive/test/test_read_format_zip_with_invalid_traditional_eocd.zip.uu \
11271133
libarchive/test/test_read_format_zip_xz_multi.zipx.uu \

0 commit comments

Comments
 (0)