dev/null |binary filter/qa/cppunit/data/tiff/fail/RC4-crash-1.tiff |binary filter/qa/cppunit/data/tiff/fail/RC4-crash-2.tiff |binary filter/qa/cppunit/data/tiff/fail/RC4-crash-3.tiff |binary filter/qa/cppunit/data/tiff/fail/RC4-crash-4.tiff |binary filter/qa/cppunit/data/tiff/fail/RC4-crash-5.tiff |binary filter/qa/cppunit/data/tiff/fail/RC4-crash-6.tiff |binary filter/qa/cppunit/data/tiff/fail/RC4-crash-7.tiff |binary filter/qa/cppunit/data/tiff/fail/RC4-hang-1.tiff |binary filter/qa/cppunit/data/tiff/fail/RC4-hang-10.tiff |binary filter/qa/cppunit/data/tiff/fail/RC4-hang-2.tiff |binary filter/qa/cppunit/data/tiff/fail/RC4-hang-3.tiff |binary filter/qa/cppunit/data/tiff/fail/RC4-hang-4.tiff |binary filter/qa/cppunit/data/tiff/fail/RC4-hang-5.tiff |binary filter/qa/cppunit/data/tiff/fail/RC4-hang-6.tiff |binary filter/qa/cppunit/data/tiff/fail/RC4-hang-7.tiff |binary filter/qa/cppunit/data/tiff/fail/RC4-hang-8.tiff |binary filter/qa/cppunit/data/tiff/fail/RC4-hang-9.tiff |binary unotest/source/cpp/filters-test.cxx | 3 ++- vcl/qa/cppunit/graphicfilter/data/wmf/fail/RC4-hang-1.wmf |binary vcl/qa/cppunit/graphicfilter/data/wmf/fail/RC4-hang-2.wmf |binary vcl/qa/cppunit/graphicfilter/data/wmf/fail/RC4-hang-3.wmf | 5 +++++ vcl/qa/cppunit/graphicfilter/data/wmf/fail/RC4-hang-4.wmf | 3 +++ 23 files changed, 10 insertions(+), 1 deletion(-)
New commits: commit 18b0343010517daa1eaf52a17ef19564076e1f3a Author: Michael Stahl <mst...@redhat.com> Date: Tue Jan 5 13:21:14 2016 +0100 RC4 encrypt some WMF and TIFF test files Reportedly some virus scanners warn about some of these files. Use a new "RC4" name prefix since the files don't come from external sources. http://permalink.gmane.org/gmane.comp.documentfoundation.libreoffice.devel/69200 Change-Id: I6d4cff2fdd5c0134bf2c77558ea09b3196b39be9 diff --git a/filter/qa/cppunit/data/tiff/fail/RC4-crash-1.tiff b/filter/qa/cppunit/data/tiff/fail/RC4-crash-1.tiff new file mode 100644 index 0000000..9e9d192 Binary files /dev/null and b/filter/qa/cppunit/data/tiff/fail/RC4-crash-1.tiff differ diff --git a/filter/qa/cppunit/data/tiff/fail/RC4-crash-2.tiff b/filter/qa/cppunit/data/tiff/fail/RC4-crash-2.tiff new file mode 100644 index 0000000..8aaede4 Binary files /dev/null and b/filter/qa/cppunit/data/tiff/fail/RC4-crash-2.tiff differ diff --git a/filter/qa/cppunit/data/tiff/fail/RC4-crash-3.tiff b/filter/qa/cppunit/data/tiff/fail/RC4-crash-3.tiff new file mode 100644 index 0000000..712e780 Binary files /dev/null and b/filter/qa/cppunit/data/tiff/fail/RC4-crash-3.tiff differ diff --git a/filter/qa/cppunit/data/tiff/fail/RC4-crash-4.tiff b/filter/qa/cppunit/data/tiff/fail/RC4-crash-4.tiff new file mode 100644 index 0000000..7c5402e Binary files /dev/null and b/filter/qa/cppunit/data/tiff/fail/RC4-crash-4.tiff differ diff --git a/filter/qa/cppunit/data/tiff/fail/RC4-crash-5.tiff b/filter/qa/cppunit/data/tiff/fail/RC4-crash-5.tiff new file mode 100644 index 0000000..97433c3 Binary files /dev/null and b/filter/qa/cppunit/data/tiff/fail/RC4-crash-5.tiff differ diff --git a/filter/qa/cppunit/data/tiff/fail/RC4-crash-6.tiff b/filter/qa/cppunit/data/tiff/fail/RC4-crash-6.tiff new file mode 100644 index 0000000..2b2846d Binary files /dev/null and b/filter/qa/cppunit/data/tiff/fail/RC4-crash-6.tiff differ diff --git a/filter/qa/cppunit/data/tiff/fail/RC4-crash-7.tiff b/filter/qa/cppunit/data/tiff/fail/RC4-crash-7.tiff new file mode 100644 index 0000000..0ca75a0 Binary files /dev/null and b/filter/qa/cppunit/data/tiff/fail/RC4-crash-7.tiff differ diff --git a/filter/qa/cppunit/data/tiff/fail/RC4-hang-1.tiff b/filter/qa/cppunit/data/tiff/fail/RC4-hang-1.tiff new file mode 100644 index 0000000..5b5b72d Binary files /dev/null and b/filter/qa/cppunit/data/tiff/fail/RC4-hang-1.tiff differ diff --git a/filter/qa/cppunit/data/tiff/fail/RC4-hang-10.tiff b/filter/qa/cppunit/data/tiff/fail/RC4-hang-10.tiff new file mode 100644 index 0000000..ad722fc Binary files /dev/null and b/filter/qa/cppunit/data/tiff/fail/RC4-hang-10.tiff differ diff --git a/filter/qa/cppunit/data/tiff/fail/RC4-hang-2.tiff b/filter/qa/cppunit/data/tiff/fail/RC4-hang-2.tiff new file mode 100644 index 0000000..9924b38 Binary files /dev/null and b/filter/qa/cppunit/data/tiff/fail/RC4-hang-2.tiff differ diff --git a/filter/qa/cppunit/data/tiff/fail/RC4-hang-3.tiff b/filter/qa/cppunit/data/tiff/fail/RC4-hang-3.tiff new file mode 100644 index 0000000..8de41b5 Binary files /dev/null and b/filter/qa/cppunit/data/tiff/fail/RC4-hang-3.tiff differ diff --git a/filter/qa/cppunit/data/tiff/fail/RC4-hang-4.tiff b/filter/qa/cppunit/data/tiff/fail/RC4-hang-4.tiff new file mode 100644 index 0000000..e51e391 Binary files /dev/null and b/filter/qa/cppunit/data/tiff/fail/RC4-hang-4.tiff differ diff --git a/filter/qa/cppunit/data/tiff/fail/RC4-hang-5.tiff b/filter/qa/cppunit/data/tiff/fail/RC4-hang-5.tiff new file mode 100644 index 0000000..1123dac Binary files /dev/null and b/filter/qa/cppunit/data/tiff/fail/RC4-hang-5.tiff differ diff --git a/filter/qa/cppunit/data/tiff/fail/RC4-hang-6.tiff b/filter/qa/cppunit/data/tiff/fail/RC4-hang-6.tiff new file mode 100644 index 0000000..fc65d92 Binary files /dev/null and b/filter/qa/cppunit/data/tiff/fail/RC4-hang-6.tiff differ diff --git a/filter/qa/cppunit/data/tiff/fail/RC4-hang-7.tiff b/filter/qa/cppunit/data/tiff/fail/RC4-hang-7.tiff new file mode 100644 index 0000000..cbac073 Binary files /dev/null and b/filter/qa/cppunit/data/tiff/fail/RC4-hang-7.tiff differ diff --git a/filter/qa/cppunit/data/tiff/fail/RC4-hang-8.tiff b/filter/qa/cppunit/data/tiff/fail/RC4-hang-8.tiff new file mode 100644 index 0000000..2ee0455 Binary files /dev/null and b/filter/qa/cppunit/data/tiff/fail/RC4-hang-8.tiff differ diff --git a/filter/qa/cppunit/data/tiff/fail/RC4-hang-9.tiff b/filter/qa/cppunit/data/tiff/fail/RC4-hang-9.tiff new file mode 100644 index 0000000..719f593 Binary files /dev/null and b/filter/qa/cppunit/data/tiff/fail/RC4-hang-9.tiff differ diff --git a/filter/qa/cppunit/data/tiff/fail/crash-1.tiff b/filter/qa/cppunit/data/tiff/fail/crash-1.tiff deleted file mode 100644 index 4fa0bb9..0000000 Binary files a/filter/qa/cppunit/data/tiff/fail/crash-1.tiff and /dev/null differ diff --git a/filter/qa/cppunit/data/tiff/fail/crash-2.tiff b/filter/qa/cppunit/data/tiff/fail/crash-2.tiff deleted file mode 100644 index aadd99f..0000000 Binary files a/filter/qa/cppunit/data/tiff/fail/crash-2.tiff and /dev/null differ diff --git a/filter/qa/cppunit/data/tiff/fail/crash-3.tiff b/filter/qa/cppunit/data/tiff/fail/crash-3.tiff deleted file mode 100644 index 4aa2393..0000000 Binary files a/filter/qa/cppunit/data/tiff/fail/crash-3.tiff and /dev/null differ diff --git a/filter/qa/cppunit/data/tiff/fail/crash-4.tiff b/filter/qa/cppunit/data/tiff/fail/crash-4.tiff deleted file mode 100644 index ef0fe27..0000000 Binary files a/filter/qa/cppunit/data/tiff/fail/crash-4.tiff and /dev/null differ diff --git a/filter/qa/cppunit/data/tiff/fail/crash-5.tiff b/filter/qa/cppunit/data/tiff/fail/crash-5.tiff deleted file mode 100644 index 4849edf..0000000 Binary files a/filter/qa/cppunit/data/tiff/fail/crash-5.tiff and /dev/null differ diff --git a/filter/qa/cppunit/data/tiff/fail/crash-6.tiff b/filter/qa/cppunit/data/tiff/fail/crash-6.tiff deleted file mode 100644 index 907b510..0000000 Binary files a/filter/qa/cppunit/data/tiff/fail/crash-6.tiff and /dev/null differ diff --git a/filter/qa/cppunit/data/tiff/fail/crash-7.tiff b/filter/qa/cppunit/data/tiff/fail/crash-7.tiff deleted file mode 100644 index 0056f9d..0000000 Binary files a/filter/qa/cppunit/data/tiff/fail/crash-7.tiff and /dev/null differ diff --git a/filter/qa/cppunit/data/tiff/fail/hang-1.tiff b/filter/qa/cppunit/data/tiff/fail/hang-1.tiff deleted file mode 100644 index 9cd2aa2..0000000 Binary files a/filter/qa/cppunit/data/tiff/fail/hang-1.tiff and /dev/null differ diff --git a/filter/qa/cppunit/data/tiff/fail/hang-10.tiff b/filter/qa/cppunit/data/tiff/fail/hang-10.tiff deleted file mode 100644 index e5e9ebc..0000000 Binary files a/filter/qa/cppunit/data/tiff/fail/hang-10.tiff and /dev/null differ diff --git a/filter/qa/cppunit/data/tiff/fail/hang-2.tiff b/filter/qa/cppunit/data/tiff/fail/hang-2.tiff deleted file mode 100644 index 28ec8c0..0000000 Binary files a/filter/qa/cppunit/data/tiff/fail/hang-2.tiff and /dev/null differ diff --git a/filter/qa/cppunit/data/tiff/fail/hang-3.tiff b/filter/qa/cppunit/data/tiff/fail/hang-3.tiff deleted file mode 100644 index 6d8cee7..0000000 Binary files a/filter/qa/cppunit/data/tiff/fail/hang-3.tiff and /dev/null differ diff --git a/filter/qa/cppunit/data/tiff/fail/hang-4.tiff b/filter/qa/cppunit/data/tiff/fail/hang-4.tiff deleted file mode 100644 index 4048941..0000000 Binary files a/filter/qa/cppunit/data/tiff/fail/hang-4.tiff and /dev/null differ diff --git a/filter/qa/cppunit/data/tiff/fail/hang-5.tiff b/filter/qa/cppunit/data/tiff/fail/hang-5.tiff deleted file mode 100644 index f1be3fa..0000000 Binary files a/filter/qa/cppunit/data/tiff/fail/hang-5.tiff and /dev/null differ diff --git a/filter/qa/cppunit/data/tiff/fail/hang-6.tiff b/filter/qa/cppunit/data/tiff/fail/hang-6.tiff deleted file mode 100644 index 4e6cc0e..0000000 Binary files a/filter/qa/cppunit/data/tiff/fail/hang-6.tiff and /dev/null differ diff --git a/filter/qa/cppunit/data/tiff/fail/hang-7.tiff b/filter/qa/cppunit/data/tiff/fail/hang-7.tiff deleted file mode 100644 index 61a5f2d..0000000 Binary files a/filter/qa/cppunit/data/tiff/fail/hang-7.tiff and /dev/null differ diff --git a/filter/qa/cppunit/data/tiff/fail/hang-8.tiff b/filter/qa/cppunit/data/tiff/fail/hang-8.tiff deleted file mode 100644 index c458597..0000000 Binary files a/filter/qa/cppunit/data/tiff/fail/hang-8.tiff and /dev/null differ diff --git a/filter/qa/cppunit/data/tiff/fail/hang-9.tiff b/filter/qa/cppunit/data/tiff/fail/hang-9.tiff deleted file mode 100644 index ef314ab..0000000 Binary files a/filter/qa/cppunit/data/tiff/fail/hang-9.tiff and /dev/null differ diff --git a/unotest/source/cpp/filters-test.cxx b/unotest/source/cpp/filters-test.cxx index 6ed09e6..b4d5cf0 100644 --- a/unotest/source/cpp/filters-test.cxx +++ b/unotest/source/cpp/filters-test.cxx @@ -98,7 +98,8 @@ void FiltersTest::recursiveScan(filterStatus nExpected, if ( (sURL.match("BID", nLastSlash+1)) || (sURL.match("CVE", nLastSlash+1)) || - (sURL.match("EDB", nLastSlash+1)) + (sURL.match("EDB", nLastSlash+1)) || + (sURL.match("RC4", nLastSlash+1)) // just means "encrypted" ) { bEncrypted = true; diff --git a/vcl/qa/cppunit/graphicfilter/data/wmf/fail/RC4-hang-1.wmf b/vcl/qa/cppunit/graphicfilter/data/wmf/fail/RC4-hang-1.wmf new file mode 100644 index 0000000..87319c2 Binary files /dev/null and b/vcl/qa/cppunit/graphicfilter/data/wmf/fail/RC4-hang-1.wmf differ diff --git a/vcl/qa/cppunit/graphicfilter/data/wmf/fail/RC4-hang-2.wmf b/vcl/qa/cppunit/graphicfilter/data/wmf/fail/RC4-hang-2.wmf new file mode 100644 index 0000000..ff20cad Binary files /dev/null and b/vcl/qa/cppunit/graphicfilter/data/wmf/fail/RC4-hang-2.wmf differ diff --git a/vcl/qa/cppunit/graphicfilter/data/wmf/fail/RC4-hang-3.wmf b/vcl/qa/cppunit/graphicfilter/data/wmf/fail/RC4-hang-3.wmf new file mode 100644 index 0000000..20a70fa --- /dev/null +++ b/vcl/qa/cppunit/graphicfilter/data/wmf/fail/RC4-hang-3.wmf @@ -0,0 +1,5 @@ +HUÒ¬BGx©}Øؤ`{3Χ~§é._1Ì,´Ê"àf[Ch!64¢/ÙLV°Ê@H½½¡Îs0=3±¼Èk]ÙiuåC)N¯F)#É°ðÅÁ÷-hK§Dz8ôê +Õ~ " ޤѳ!>øø¼ù¯iÐHh×®¦cCߨ?jaC °Ùε +®¨#êBqoìbëÛa6Tâ_ÇWõ+¦³ o'P¨eSÑ%^Ì«%©' æÅ_VÇKpJ62AFéÔÅ<+q³Ijbö¶n} {êgÌÆ"û!k[3ÀA²Ã+t}s +¢-·Ò>m=÷÷¢~HZ §(¾®ÞÒßfß[ÿc ¬36§_G¯ß\äÉV@BzyâGßd2În)|3 Ãcz¼îâD÷¿Ýæ2_æ¨&pNxø9YÝXD`ýFh¿4+·õC^§b×Ë?o +@Öq \ No newline at end of file diff --git a/vcl/qa/cppunit/graphicfilter/data/wmf/fail/RC4-hang-4.wmf b/vcl/qa/cppunit/graphicfilter/data/wmf/fail/RC4-hang-4.wmf new file mode 100644 index 0000000..045f1f4 --- /dev/null +++ b/vcl/qa/cppunit/graphicfilter/data/wmf/fail/RC4-hang-4.wmf @@ -0,0 +1,3 @@ +6.Gx©GÓ;>³eë2Î 8Yíà-Ñ1Ì-è#áv5."Þ2¢/Ùf_°ÔL½B¡ÎÏÄê±´Èi]YowÙ¼(çKP¹ +)W`1a¨%#Xmi×-ã +Hn<ônÕ~ ÖáË©¡Z!> Ø|xíHf}ÐHôx;ºëcCa¹?jlGCLO9VƵ$è#äBq]a¦Ök Ý.²w°Åx}þÆùº¤ß c461JpHÑ«!©'fæ¥7VÇWpJp2AFvGÍ<7jú \ No newline at end of file diff --git a/vcl/qa/cppunit/graphicfilter/data/wmf/fail/hang-1.wmf b/vcl/qa/cppunit/graphicfilter/data/wmf/fail/hang-1.wmf deleted file mode 100644 index 7ba05cb..0000000 Binary files a/vcl/qa/cppunit/graphicfilter/data/wmf/fail/hang-1.wmf and /dev/null differ diff --git a/vcl/qa/cppunit/graphicfilter/data/wmf/fail/hang-2.wmf b/vcl/qa/cppunit/graphicfilter/data/wmf/fail/hang-2.wmf deleted file mode 100644 index f8f1538..0000000 Binary files a/vcl/qa/cppunit/graphicfilter/data/wmf/fail/hang-2.wmf and /dev/null differ diff --git a/vcl/qa/cppunit/graphicfilter/data/wmf/fail/hang-3.wmf b/vcl/qa/cppunit/graphicfilter/data/wmf/fail/hang-3.wmf deleted file mode 100644 index 80ad795..0000000 Binary files a/vcl/qa/cppunit/graphicfilter/data/wmf/fail/hang-3.wmf and /dev/null differ diff --git a/vcl/qa/cppunit/graphicfilter/data/wmf/fail/hang-4.wmf b/vcl/qa/cppunit/graphicfilter/data/wmf/fail/hang-4.wmf deleted file mode 100644 index f16b60c..0000000 Binary files a/vcl/qa/cppunit/graphicfilter/data/wmf/fail/hang-4.wmf and /dev/null differ
_______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits