Skip a test if the platform does not have cryptographic functionarity.

diff --git a/libarchive/test/test_read_format_zip_traditional_encryption_data.c b/libarchive/test/test_read_format_zip_traditional_encryption_data.c
index 8234c637742d30591980d8b4863117f05988c80d..a0f033b0f7e7b2736a76e789721cf02edc9d7fb4 100644 (file)
--- a/libarchive/test/test_read_format_zip_traditional_encryption_data.c
+++ b/libarchive/test/test_read_format_zip_traditional_encryption_data.c
@@ -36,6 +36,19 @@ DEFINE_TEST(test_read_format_zip_traditional_encryption_data)
        struct archive *a;
        char buff[512];
 
+       /* Check if running system has cryptographic functionarity. */
+       assert((a = archive_write_new()) != NULL);
+       assertEqualIntA(a, ARCHIVE_OK, archive_write_set_format_zip(a));
+       assertEqualIntA(a, ARCHIVE_OK, archive_write_add_filter_none(a));
+       if (ARCHIVE_OK != archive_write_set_options(a,
+                               "zip:encryption=traditional")) {
+               skipping("This system does not have cryptographic liberary");
+               archive_write_free(a);
+               return;
+       }
+       archive_write_free(a);
+
+
        extract_reference_file(refname);
 
        /*

diff --git a/libarchive/test/test_read_format_zip_winzip_aes.c b/libarchive/test/test_read_format_zip_winzip_aes.c
index 67284168c90c9952135ab6ba62d9b8ad37e5ba49..61e64b643c66e613ec12e78d99c4172f3096e79c 100644 (file)
--- a/libarchive/test/test_read_format_zip_winzip_aes.c
+++ b/libarchive/test/test_read_format_zip_winzip_aes.c
@@ -33,6 +33,19 @@ test_winzip_aes(const char *refname)
        struct archive *a;
        char buff[512];
 
+       /* Check if running system has cryptographic functionarity. */
+       assert((a = archive_write_new()) != NULL);
+       assertEqualIntA(a, ARCHIVE_OK, archive_write_set_format_zip(a));
+       assertEqualIntA(a, ARCHIVE_OK, archive_write_add_filter_none(a));
+       if (ARCHIVE_OK != archive_write_set_options(a,
+                               "zip:encryption=aes256")) {
+               skipping("This system does not have cryptographic liberary");
+               archive_write_free(a);
+               return;
+       }
+       archive_write_free(a);
+
+
        extract_reference_file(refname);
 
        /*

diff --git a/libarchive/test/test_write_format_zip.c b/libarchive/test/test_write_format_zip.c
index ece1d40044e0173ac29f4e59771cec9c2250987d..c080f6bc857c05161986b1d0240c066538a41e8b 100644 (file)
--- a/libarchive/test/test_write_format_zip.c
+++ b/libarchive/test/test_write_format_zip.c
@@ -681,8 +681,12 @@ DEFINE_TEST(test_write_format_zip_traditional_pkware_encryption)
        assert((a = archive_write_new()) != NULL);
        assertEqualIntA(a, ARCHIVE_OK, archive_write_set_format_zip(a));
        assertEqualIntA(a, ARCHIVE_OK, archive_write_add_filter_none(a));
-       assertEqualIntA(a, ARCHIVE_OK,
-           archive_write_set_options(a, "zip:encryption=traditional"));
+       if (ARCHIVE_OK != archive_write_set_options(a,
+                   "zip:encryption=traditional")) {
+               skipping("This system does not have cryptographic liberary");
+               archive_write_free(a);
+               return;
+       }
        assertEqualIntA(a, ARCHIVE_OK,
            archive_write_set_options(a, "zip:password=password1234"));
        assertEqualIntA(a, ARCHIVE_OK,
@@ -756,8 +760,12 @@ DEFINE_TEST(test_write_format_zip_winzip_aes128_encryption)
        assert((a = archive_write_new()) != NULL);
        assertEqualIntA(a, ARCHIVE_OK, archive_write_set_format_zip(a));
        assertEqualIntA(a, ARCHIVE_OK, archive_write_add_filter_none(a));
-       assertEqualIntA(a, ARCHIVE_OK,
-           archive_write_set_options(a, "zip:encryption=aes128"));
+       if (ARCHIVE_OK != archive_write_set_options(a, "zip:encryption=aes128"))
+       {
+               skipping("This system does not have cryptographic liberary");
+               archive_write_free(a);
+               return;
+       }
        assertEqualIntA(a, ARCHIVE_OK,
            archive_write_set_options(a, "zip:password=password1234"));
        assertEqualIntA(a, ARCHIVE_OK,
@@ -831,8 +839,12 @@ DEFINE_TEST(test_write_format_zip_winzip_aes256_encryption)
        assert((a = archive_write_new()) != NULL);
        assertEqualIntA(a, ARCHIVE_OK, archive_write_set_format_zip(a));
        assertEqualIntA(a, ARCHIVE_OK, archive_write_add_filter_none(a));
-       assertEqualIntA(a, ARCHIVE_OK,
-           archive_write_set_options(a, "zip:encryption=aes256"));
+       if (ARCHIVE_OK != archive_write_set_options(a, "zip:encryption=aes256"))
+       {
+               skipping("This system does not have cryptographic liberary");
+               archive_write_free(a);
+               return;
+       }
        assertEqualIntA(a, ARCHIVE_OK,
            archive_write_set_options(a, "zip:password=password1234"));
        assertEqualIntA(a, ARCHIVE_OK,