From 8d71c4863e1279ae700adce5d83f4c619ceb2d4d Mon Sep 17 00:00:00 2001 From: Tim Kientzle Date: Thu, 26 Dec 2013 14:02:03 -0800 Subject: [PATCH] Adjust expected permissions; zip code has slightly tightened the default permissions used when extracting files. --- libarchive/test/test_read_format_zip_encryption_data.c | 4 ++-- libarchive/test/test_read_format_zip_encryption_partially.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/libarchive/test/test_read_format_zip_encryption_data.c b/libarchive/test/test_read_format_zip_encryption_data.c index 6e36663c5..b56d78e90 100644 --- a/libarchive/test/test_read_format_zip_encryption_data.c +++ b/libarchive/test/test_read_format_zip_encryption_data.c @@ -45,7 +45,7 @@ DEFINE_TEST(test_read_format_zip_encryption_data) /* Verify encrypted file "bar.txt" */ assertEqualIntA(a, ARCHIVE_OK, archive_read_next_header(a, &ae)); - assertEqualInt((AE_IFREG | 0666), archive_entry_mode(ae)); + assertEqualInt((AE_IFREG | 0664), archive_entry_mode(ae)); assertEqualString("bar.txt", archive_entry_pathname(ae)); assertEqualInt(20, archive_entry_size(ae)); assertEqualInt(1, archive_entry_is_data_encrypted(ae)); @@ -55,7 +55,7 @@ DEFINE_TEST(test_read_format_zip_encryption_data) /* Verify encrypted file "foo.txt" */ assertEqualIntA(a, ARCHIVE_OK, archive_read_next_header(a, &ae)); - assertEqualInt((AE_IFREG | 0666), archive_entry_mode(ae)); + assertEqualInt((AE_IFREG | 0664), archive_entry_mode(ae)); assertEqualString("foo.txt", archive_entry_pathname(ae)); assertEqualInt(20, archive_entry_size(ae)); assertEqualInt(1, archive_entry_is_data_encrypted(ae)); diff --git a/libarchive/test/test_read_format_zip_encryption_partially.c b/libarchive/test/test_read_format_zip_encryption_partially.c index 9d862dcd2..77af235d5 100644 --- a/libarchive/test/test_read_format_zip_encryption_partially.c +++ b/libarchive/test/test_read_format_zip_encryption_partially.c @@ -46,7 +46,7 @@ DEFINE_TEST(test_read_format_zip_encryption_partially) /* Verify unencrypted file "bar.txt". */ assertEqualIntA(a, ARCHIVE_OK, archive_read_next_header(a, &ae)); - assertEqualInt((AE_IFREG | 0666), archive_entry_mode(ae)); + assertEqualInt((AE_IFREG | 0664), archive_entry_mode(ae)); assertEqualString("bar.txt", archive_entry_pathname(ae)); assertEqualInt(20, archive_entry_size(ae)); assertEqualInt(0, archive_entry_is_data_encrypted(ae)); @@ -56,7 +56,7 @@ DEFINE_TEST(test_read_format_zip_encryption_partially) /* Verify encrypted file "foo.txt". */ assertEqualIntA(a, ARCHIVE_OK, archive_read_next_header(a, &ae)); - assertEqualInt((AE_IFREG | 0666), archive_entry_mode(ae)); + assertEqualInt((AE_IFREG | 0664), archive_entry_mode(ae)); assertEqualString("foo.txt", archive_entry_pathname(ae)); assertEqualInt(20, archive_entry_size(ae)); assertEqualInt(1, archive_entry_is_data_encrypted(ae)); -- 2.47.2