summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2011-09-30 16:12:52 +0100
committerCaolán McNamara <caolanm@redhat.com>2011-09-30 17:02:37 +0100
commite898bcc1c2f2d227d8b638dfbee01e393562e142 (patch)
tree2a796ad9111f030fa55050cb7c65530a67b623a6
parent8c0a791b74005765b99a8d7bd6e2b5d2f998b7f3 (diff)
silence tedious malware checkers, arcfour, key 0x435645
-rw-r--r--sc/qa/unit/data/qpro/fail/CVE-2007-5747-1.wb2bin5409 -> 5409 bytes
-rw-r--r--sc/qa/unit/data/qpro/pass/CVE-2007-5745-1.wb2bin45006 -> 45006 bytes
-rw-r--r--sc/qa/unit/data/qpro/pass/CVE-2007-5745-2.wb2bin45006 -> 45006 bytes
-rw-r--r--svtools/qa/cppunit/data/emf/fail/CVE-2004-0209-1.emfbin576 -> 576 bytes
-rw-r--r--svtools/qa/cppunit/data/emf/fail/CVE-2008-1083-1.emfbin3524 -> 3524 bytes
-rw-r--r--svtools/qa/cppunit/data/emf/fail/CVE-2009-1217-1.emfbin1075 -> 1075 bytes
-rw-r--r--svtools/qa/cppunit/data/emf/pass/CVE-2008-1087-1.emfbin3380 -> 3380 bytes
-rw-r--r--svtools/qa/cppunit/data/wmf/fail/CVE-2005-2123-1.wmf-0.009-676bin684 -> 684 bytes
-rw-r--r--svtools/qa/cppunit/data/wmf/fail/CVE-2005-2124-1.wmfbin218 -> 218 bytes
-rw-r--r--svtools/qa/cppunit/data/wmf/fail/CVE-2006-0143-1.wmfbin68 -> 68 bytes
-rw-r--r--svtools/qa/cppunit/data/wmf/fail/CVE-2006-0143-2.wmfbin68 -> 68 bytes
-rw-r--r--svtools/qa/cppunit/data/wmf/pass/CVE-2005-2123-1.wmfbin684 -> 684 bytes
-rw-r--r--svtools/qa/cppunit/data/wmf/pass/CVE-2006-4071-1.wmfbin68 -> 68 bytes
-rw-r--r--svtools/qa/cppunit/data/wmf/pass/CVE-2007-1090-1.wmfbin238 -> 238 bytes
-rw-r--r--svtools/qa/cppunit/data/wmf/pass/CVE-2007-1238-1.wmfbin382 -> 382 bytes
-rw-r--r--svtools/qa/cppunit/data/wmf/pass/CVE-2007-1245-1.wmfbin382 -> 382 bytes
-rw-r--r--sw/qa/core/data/ww8/fail/CVE-2005-0941-1.docbin32256 -> 32256 bytes
-rw-r--r--sw/qa/core/data/ww8/fail/CVE-2006-2389-1.docbin98816 -> 98816 bytes
-rw-r--r--sw/qa/core/data/ww8/fail/CVE-2008-0320-1.docbin116224 -> 116224 bytes
-rw-r--r--sw/qa/core/data/ww8/pass/CVE-2006-3493-1.docbin48128 -> 48128 bytes
-rw-r--r--sw/qa/core/data/ww8/pass/CVE-2006-6561-1.docbin26624 -> 26624 bytes
-rw-r--r--sw/qa/core/data/ww8/pass/CVE-2006-6628-1.docbin26624 -> 26624 bytes
-rw-r--r--sw/qa/core/data/ww8/pass/CVE-2007-1347-1.docbin24064 -> 24064 bytes
-rw-r--r--sw/qa/core/data/ww8/pass/CVE-2008-2752-1.docbin25088 -> 25088 bytes
-rw-r--r--sw/qa/core/data/ww8/pass/CVE-2008-2752-2.docbin24576 -> 24576 bytes
-rw-r--r--sw/qa/core/data/ww8/pass/CVE-2008-2752-3.docbin22528 -> 22528 bytes
-rw-r--r--sw/qa/core/data/ww8/pass/CVE-2008-2752-4.docbin23040 -> 23040 bytes
-rw-r--r--sw/qa/core/data/ww8/pass/CVE-2008-4841-1.docbin101888 -> 101888 bytes
-rw-r--r--sw/qa/core/data/ww8/pass/CVE-2009-0200-1.docbin8192 -> 8192 bytes
-rw-r--r--sw/qa/core/data/ww8/pass/CVE-2009-0201-1.docbin8192 -> 8192 bytes
-rw-r--r--sw/qa/core/data/ww8/pass/CVE-2009-0259-1.docbin101888 -> 101888 bytes
-rw-r--r--sw/qa/core/data/ww8/pass/CVE-2009-3301-1.docbin27648 -> 27648 bytes
-rw-r--r--sw/qa/core/data/ww8/pass/CVE-2009-3302-1.docbin27648 -> 27648 bytes
-rw-r--r--sw/qa/core/data/ww8/pass/CVE-2009-3302-2.docbin27648 -> 27648 bytes
-rw-r--r--sw/qa/core/data/ww8/pass/CVE-2010-3200-1.docbin48128 -> 48128 bytes
-rw-r--r--sw/qa/core/data/ww8/pass/CVE-2010-3453-1.docbin126464 -> 126464 bytes
-rw-r--r--sw/qa/core/data/ww8/pass/CVE-2010-3454-1.docbin126464 -> 126464 bytes
-rw-r--r--sw/qa/core/data/xml/fail/CVE-2006-3117-1.sxwbin441416 -> 441416 bytes
-rw-r--r--test/inc/test/filters-test.hxx8
-rw-r--r--test/source/filters-test.cxx51
-rw-r--r--writerfilter/qa/cppunittests/rtftok/data/fail/CVE-2005-2971-1.rtfbin10867 -> 10867 bytes
-rw-r--r--writerfilter/qa/cppunittests/rtftok/data/fail/CVE-2010-3451-1.rtfbin4091 -> 4091 bytes
-rw-r--r--writerfilter/qa/cppunittests/rtftok/data/pass/CVE-2005-2964.rtfbin10869 -> 10869 bytes
-rw-r--r--writerfilter/qa/cppunittests/rtftok/data/pass/CVE-2005-2972-1.rtfbin4055 -> 4055 bytes
-rw-r--r--writerfilter/qa/cppunittests/rtftok/data/pass/CVE-2005-2972-2.rtfbin4055 -> 4055 bytes
-rw-r--r--writerfilter/qa/cppunittests/rtftok/data/pass/CVE-2007-0245-1.rtfbin11167 -> 11167 bytes
-rw-r--r--writerfilter/qa/cppunittests/rtftok/data/pass/CVE-2010-3333-1.rtfbin11289 -> 11289 bytes
-rw-r--r--writerfilter/qa/cppunittests/rtftok/data/pass/CVE-2010-3452-1.rtf2
48 files changed, 58 insertions, 3 deletions
diff --git a/sc/qa/unit/data/qpro/fail/CVE-2007-5747-1.wb2 b/sc/qa/unit/data/qpro/fail/CVE-2007-5747-1.wb2
index ca91826b9be9..c7ce93a670a9 100644
--- a/sc/qa/unit/data/qpro/fail/CVE-2007-5747-1.wb2
+++ b/sc/qa/unit/data/qpro/fail/CVE-2007-5747-1.wb2
Binary files differ
diff --git a/sc/qa/unit/data/qpro/pass/CVE-2007-5745-1.wb2 b/sc/qa/unit/data/qpro/pass/CVE-2007-5745-1.wb2
index 0ba60b26cda7..6e525c39f422 100644
--- a/sc/qa/unit/data/qpro/pass/CVE-2007-5745-1.wb2
+++ b/sc/qa/unit/data/qpro/pass/CVE-2007-5745-1.wb2
Binary files differ
diff --git a/sc/qa/unit/data/qpro/pass/CVE-2007-5745-2.wb2 b/sc/qa/unit/data/qpro/pass/CVE-2007-5745-2.wb2
index 8a9eca970532..b034a8c15976 100644
--- a/sc/qa/unit/data/qpro/pass/CVE-2007-5745-2.wb2
+++ b/sc/qa/unit/data/qpro/pass/CVE-2007-5745-2.wb2
Binary files differ
diff --git a/svtools/qa/cppunit/data/emf/fail/CVE-2004-0209-1.emf b/svtools/qa/cppunit/data/emf/fail/CVE-2004-0209-1.emf
index 2f77fcda3b99..a511da43add5 100644
--- a/svtools/qa/cppunit/data/emf/fail/CVE-2004-0209-1.emf
+++ b/svtools/qa/cppunit/data/emf/fail/CVE-2004-0209-1.emf
Binary files differ
diff --git a/svtools/qa/cppunit/data/emf/fail/CVE-2008-1083-1.emf b/svtools/qa/cppunit/data/emf/fail/CVE-2008-1083-1.emf
index 0cbd952de2f6..dd57d9102cd1 100644
--- a/svtools/qa/cppunit/data/emf/fail/CVE-2008-1083-1.emf
+++ b/svtools/qa/cppunit/data/emf/fail/CVE-2008-1083-1.emf
Binary files differ
diff --git a/svtools/qa/cppunit/data/emf/fail/CVE-2009-1217-1.emf b/svtools/qa/cppunit/data/emf/fail/CVE-2009-1217-1.emf
index ee7db91e37fe..8fa6e9377938 100644
--- a/svtools/qa/cppunit/data/emf/fail/CVE-2009-1217-1.emf
+++ b/svtools/qa/cppunit/data/emf/fail/CVE-2009-1217-1.emf
Binary files differ
diff --git a/svtools/qa/cppunit/data/emf/pass/CVE-2008-1087-1.emf b/svtools/qa/cppunit/data/emf/pass/CVE-2008-1087-1.emf
index 9bc2a3f203fa..c71739a50b99 100644
--- a/svtools/qa/cppunit/data/emf/pass/CVE-2008-1087-1.emf
+++ b/svtools/qa/cppunit/data/emf/pass/CVE-2008-1087-1.emf
Binary files differ
diff --git a/svtools/qa/cppunit/data/wmf/fail/CVE-2005-2123-1.wmf-0.009-676 b/svtools/qa/cppunit/data/wmf/fail/CVE-2005-2123-1.wmf-0.009-676
index dccd6402178c..49d3ddf28b02 100644
--- a/svtools/qa/cppunit/data/wmf/fail/CVE-2005-2123-1.wmf-0.009-676
+++ b/svtools/qa/cppunit/data/wmf/fail/CVE-2005-2123-1.wmf-0.009-676
Binary files differ
diff --git a/svtools/qa/cppunit/data/wmf/fail/CVE-2005-2124-1.wmf b/svtools/qa/cppunit/data/wmf/fail/CVE-2005-2124-1.wmf
index 5826a98277c2..ac546ce5b14c 100644
--- a/svtools/qa/cppunit/data/wmf/fail/CVE-2005-2124-1.wmf
+++ b/svtools/qa/cppunit/data/wmf/fail/CVE-2005-2124-1.wmf
Binary files differ
diff --git a/svtools/qa/cppunit/data/wmf/fail/CVE-2006-0143-1.wmf b/svtools/qa/cppunit/data/wmf/fail/CVE-2006-0143-1.wmf
index 07db62c2a48c..b68b7403c338 100644
--- a/svtools/qa/cppunit/data/wmf/fail/CVE-2006-0143-1.wmf
+++ b/svtools/qa/cppunit/data/wmf/fail/CVE-2006-0143-1.wmf
Binary files differ
diff --git a/svtools/qa/cppunit/data/wmf/fail/CVE-2006-0143-2.wmf b/svtools/qa/cppunit/data/wmf/fail/CVE-2006-0143-2.wmf
index 5b99a4883ce8..370abe0e249d 100644
--- a/svtools/qa/cppunit/data/wmf/fail/CVE-2006-0143-2.wmf
+++ b/svtools/qa/cppunit/data/wmf/fail/CVE-2006-0143-2.wmf
Binary files differ
diff --git a/svtools/qa/cppunit/data/wmf/pass/CVE-2005-2123-1.wmf b/svtools/qa/cppunit/data/wmf/pass/CVE-2005-2123-1.wmf
index 6af243b587c5..e70664e64aa0 100644
--- a/svtools/qa/cppunit/data/wmf/pass/CVE-2005-2123-1.wmf
+++ b/svtools/qa/cppunit/data/wmf/pass/CVE-2005-2123-1.wmf
Binary files differ
diff --git a/svtools/qa/cppunit/data/wmf/pass/CVE-2006-4071-1.wmf b/svtools/qa/cppunit/data/wmf/pass/CVE-2006-4071-1.wmf
index 794a7ef9af08..cdb09c6b21e2 100644
--- a/svtools/qa/cppunit/data/wmf/pass/CVE-2006-4071-1.wmf
+++ b/svtools/qa/cppunit/data/wmf/pass/CVE-2006-4071-1.wmf
Binary files differ
diff --git a/svtools/qa/cppunit/data/wmf/pass/CVE-2007-1090-1.wmf b/svtools/qa/cppunit/data/wmf/pass/CVE-2007-1090-1.wmf
index c050fa6e3b4d..7864da572ca2 100644
--- a/svtools/qa/cppunit/data/wmf/pass/CVE-2007-1090-1.wmf
+++ b/svtools/qa/cppunit/data/wmf/pass/CVE-2007-1090-1.wmf
Binary files differ
diff --git a/svtools/qa/cppunit/data/wmf/pass/CVE-2007-1238-1.wmf b/svtools/qa/cppunit/data/wmf/pass/CVE-2007-1238-1.wmf
index a01e310089b0..10da32742570 100644
--- a/svtools/qa/cppunit/data/wmf/pass/CVE-2007-1238-1.wmf
+++ b/svtools/qa/cppunit/data/wmf/pass/CVE-2007-1238-1.wmf
Binary files differ
diff --git a/svtools/qa/cppunit/data/wmf/pass/CVE-2007-1245-1.wmf b/svtools/qa/cppunit/data/wmf/pass/CVE-2007-1245-1.wmf
index a01e310089b0..10da32742570 100644
--- a/svtools/qa/cppunit/data/wmf/pass/CVE-2007-1245-1.wmf
+++ b/svtools/qa/cppunit/data/wmf/pass/CVE-2007-1245-1.wmf
Binary files differ
diff --git a/sw/qa/core/data/ww8/fail/CVE-2005-0941-1.doc b/sw/qa/core/data/ww8/fail/CVE-2005-0941-1.doc
index 18b300c8525e..a1f5b7668bcd 100644
--- a/sw/qa/core/data/ww8/fail/CVE-2005-0941-1.doc
+++ b/sw/qa/core/data/ww8/fail/CVE-2005-0941-1.doc
Binary files differ
diff --git a/sw/qa/core/data/ww8/fail/CVE-2006-2389-1.doc b/sw/qa/core/data/ww8/fail/CVE-2006-2389-1.doc
index a1bf07a71a82..a99da57e8c74 100644
--- a/sw/qa/core/data/ww8/fail/CVE-2006-2389-1.doc
+++ b/sw/qa/core/data/ww8/fail/CVE-2006-2389-1.doc
Binary files differ
diff --git a/sw/qa/core/data/ww8/fail/CVE-2008-0320-1.doc b/sw/qa/core/data/ww8/fail/CVE-2008-0320-1.doc
index b5a08324f1c5..5c6d351f25e5 100644
--- a/sw/qa/core/data/ww8/fail/CVE-2008-0320-1.doc
+++ b/sw/qa/core/data/ww8/fail/CVE-2008-0320-1.doc
Binary files differ
diff --git a/sw/qa/core/data/ww8/pass/CVE-2006-3493-1.doc b/sw/qa/core/data/ww8/pass/CVE-2006-3493-1.doc
index af452ddc0e5f..4623e3c1904a 100644
--- a/sw/qa/core/data/ww8/pass/CVE-2006-3493-1.doc
+++ b/sw/qa/core/data/ww8/pass/CVE-2006-3493-1.doc
Binary files differ
diff --git a/sw/qa/core/data/ww8/pass/CVE-2006-6561-1.doc b/sw/qa/core/data/ww8/pass/CVE-2006-6561-1.doc
index 240ea77bca12..390a6634d13b 100644
--- a/sw/qa/core/data/ww8/pass/CVE-2006-6561-1.doc
+++ b/sw/qa/core/data/ww8/pass/CVE-2006-6561-1.doc
Binary files differ
diff --git a/sw/qa/core/data/ww8/pass/CVE-2006-6628-1.doc b/sw/qa/core/data/ww8/pass/CVE-2006-6628-1.doc
index 240ea77bca12..390a6634d13b 100644
--- a/sw/qa/core/data/ww8/pass/CVE-2006-6628-1.doc
+++ b/sw/qa/core/data/ww8/pass/CVE-2006-6628-1.doc
Binary files differ
diff --git a/sw/qa/core/data/ww8/pass/CVE-2007-1347-1.doc b/sw/qa/core/data/ww8/pass/CVE-2007-1347-1.doc
index d25e62ab2416..dabcf3fbaab8 100644
--- a/sw/qa/core/data/ww8/pass/CVE-2007-1347-1.doc
+++ b/sw/qa/core/data/ww8/pass/CVE-2007-1347-1.doc
Binary files differ
diff --git a/sw/qa/core/data/ww8/pass/CVE-2008-2752-1.doc b/sw/qa/core/data/ww8/pass/CVE-2008-2752-1.doc
index f51fa8fe9b2e..20c40a840918 100644
--- a/sw/qa/core/data/ww8/pass/CVE-2008-2752-1.doc
+++ b/sw/qa/core/data/ww8/pass/CVE-2008-2752-1.doc
Binary files differ
diff --git a/sw/qa/core/data/ww8/pass/CVE-2008-2752-2.doc b/sw/qa/core/data/ww8/pass/CVE-2008-2752-2.doc
index 7ce7a07bb6e2..569967ef92a4 100644
--- a/sw/qa/core/data/ww8/pass/CVE-2008-2752-2.doc
+++ b/sw/qa/core/data/ww8/pass/CVE-2008-2752-2.doc
Binary files differ
diff --git a/sw/qa/core/data/ww8/pass/CVE-2008-2752-3.doc b/sw/qa/core/data/ww8/pass/CVE-2008-2752-3.doc
index 8b04872af739..3fe55f6db1b3 100644
--- a/sw/qa/core/data/ww8/pass/CVE-2008-2752-3.doc
+++ b/sw/qa/core/data/ww8/pass/CVE-2008-2752-3.doc
Binary files differ
diff --git a/sw/qa/core/data/ww8/pass/CVE-2008-2752-4.doc b/sw/qa/core/data/ww8/pass/CVE-2008-2752-4.doc
index 148a30d4ab35..1bd549907e64 100644
--- a/sw/qa/core/data/ww8/pass/CVE-2008-2752-4.doc
+++ b/sw/qa/core/data/ww8/pass/CVE-2008-2752-4.doc
Binary files differ
diff --git a/sw/qa/core/data/ww8/pass/CVE-2008-4841-1.doc b/sw/qa/core/data/ww8/pass/CVE-2008-4841-1.doc
index 0942b6d8d466..37b994534167 100644
--- a/sw/qa/core/data/ww8/pass/CVE-2008-4841-1.doc
+++ b/sw/qa/core/data/ww8/pass/CVE-2008-4841-1.doc
Binary files differ
diff --git a/sw/qa/core/data/ww8/pass/CVE-2009-0200-1.doc b/sw/qa/core/data/ww8/pass/CVE-2009-0200-1.doc
index a142fec96b19..6b9fb25f7470 100644
--- a/sw/qa/core/data/ww8/pass/CVE-2009-0200-1.doc
+++ b/sw/qa/core/data/ww8/pass/CVE-2009-0200-1.doc
Binary files differ
diff --git a/sw/qa/core/data/ww8/pass/CVE-2009-0201-1.doc b/sw/qa/core/data/ww8/pass/CVE-2009-0201-1.doc
index bc6182d1d528..462b17bef380 100644
--- a/sw/qa/core/data/ww8/pass/CVE-2009-0201-1.doc
+++ b/sw/qa/core/data/ww8/pass/CVE-2009-0201-1.doc
Binary files differ
diff --git a/sw/qa/core/data/ww8/pass/CVE-2009-0259-1.doc b/sw/qa/core/data/ww8/pass/CVE-2009-0259-1.doc
index 0942b6d8d466..37b994534167 100644
--- a/sw/qa/core/data/ww8/pass/CVE-2009-0259-1.doc
+++ b/sw/qa/core/data/ww8/pass/CVE-2009-0259-1.doc
Binary files differ
diff --git a/sw/qa/core/data/ww8/pass/CVE-2009-3301-1.doc b/sw/qa/core/data/ww8/pass/CVE-2009-3301-1.doc
index 8f1c2de02016..8351c834cc2f 100644
--- a/sw/qa/core/data/ww8/pass/CVE-2009-3301-1.doc
+++ b/sw/qa/core/data/ww8/pass/CVE-2009-3301-1.doc
Binary files differ
diff --git a/sw/qa/core/data/ww8/pass/CVE-2009-3302-1.doc b/sw/qa/core/data/ww8/pass/CVE-2009-3302-1.doc
index 8f1c2de02016..8351c834cc2f 100644
--- a/sw/qa/core/data/ww8/pass/CVE-2009-3302-1.doc
+++ b/sw/qa/core/data/ww8/pass/CVE-2009-3302-1.doc
Binary files differ
diff --git a/sw/qa/core/data/ww8/pass/CVE-2009-3302-2.doc b/sw/qa/core/data/ww8/pass/CVE-2009-3302-2.doc
index 0cd7a7dcd1f7..f8181f3db6be 100644
--- a/sw/qa/core/data/ww8/pass/CVE-2009-3302-2.doc
+++ b/sw/qa/core/data/ww8/pass/CVE-2009-3302-2.doc
Binary files differ
diff --git a/sw/qa/core/data/ww8/pass/CVE-2010-3200-1.doc b/sw/qa/core/data/ww8/pass/CVE-2010-3200-1.doc
index 596aec93bd60..4bdb0532a8ac 100644
--- a/sw/qa/core/data/ww8/pass/CVE-2010-3200-1.doc
+++ b/sw/qa/core/data/ww8/pass/CVE-2010-3200-1.doc
Binary files differ
diff --git a/sw/qa/core/data/ww8/pass/CVE-2010-3453-1.doc b/sw/qa/core/data/ww8/pass/CVE-2010-3453-1.doc
index 22cd8eebbe54..62dacdc29bf2 100644
--- a/sw/qa/core/data/ww8/pass/CVE-2010-3453-1.doc
+++ b/sw/qa/core/data/ww8/pass/CVE-2010-3453-1.doc
Binary files differ
diff --git a/sw/qa/core/data/ww8/pass/CVE-2010-3454-1.doc b/sw/qa/core/data/ww8/pass/CVE-2010-3454-1.doc
index 33706c2c3393..9bbadc09476c 100644
--- a/sw/qa/core/data/ww8/pass/CVE-2010-3454-1.doc
+++ b/sw/qa/core/data/ww8/pass/CVE-2010-3454-1.doc
Binary files differ
diff --git a/sw/qa/core/data/xml/fail/CVE-2006-3117-1.sxw b/sw/qa/core/data/xml/fail/CVE-2006-3117-1.sxw
index 49acb42d81e8..1f4d4d3b2f6b 100644
--- a/sw/qa/core/data/xml/fail/CVE-2006-3117-1.sxw
+++ b/sw/qa/core/data/xml/fail/CVE-2006-3117-1.sxw
Binary files differ
diff --git a/test/inc/test/filters-test.hxx b/test/inc/test/filters-test.hxx
index 721f44227177..6c82944d1cac 100644
--- a/test/inc/test/filters-test.hxx
+++ b/test/inc/test/filters-test.hxx
@@ -40,8 +40,14 @@ enum filterStatus
indeterminate = 2
};
+/*
+ * NOTE, any files beginning with CVE- will be assumed to be encrypted using
+ * arcfour with key 0x435645, this is just to silence panicky
+ * virus/malware-checkers
+ *
+ * e.g. m[de]crypt --bare -a arcfour -o hex -k 435645 -s 3
+ */
/* Implementation of Filters test */
-
class OOO_DLLPUBLIC_TEST FiltersTest : public test::BootstrapFixture
{
public:
diff --git a/test/source/filters-test.cxx b/test/source/filters-test.cxx
index aeb92d9727f4..aa6fe316b905 100644
--- a/test/source/filters-test.cxx
+++ b/test/source/filters-test.cxx
@@ -30,11 +30,47 @@
#include <test/filters-test.hxx>
#include <osl/file.hxx>
#include <osl/thread.h>
+#include <rtl/cipher.h>
using namespace ::com::sun::star;
namespace test {
+void decode(const rtl::OUString& rIn, const rtl::OUString &rOut)
+{
+ rtlCipher cipher = rtl_cipher_create(rtl_Cipher_AlgorithmARCFOUR, rtl_Cipher_ModeStream);
+ CPPUNIT_ASSERT_MESSAGE("cipher creation failed", cipher != 0);
+
+ //mcrypt --bare -a arcfour -o hex -k 435645 -s 3
+ const sal_uInt8 aKey[3] = {'C', 'V', 'E'};
+
+ rtlCipherError result = rtl_cipher_init(cipher, rtl_Cipher_DirectionDecode, aKey, SAL_N_ELEMENTS(aKey), 0, 0);
+
+ CPPUNIT_ASSERT_MESSAGE("cipher init failed", result == rtl_Cipher_E_None);
+
+ osl::File aIn(rIn);
+ CPPUNIT_ASSERT(osl::FileBase::E_None == aIn.open(osl_File_OpenFlag_Read));
+
+ osl::File aOut(rOut);
+ CPPUNIT_ASSERT(osl::FileBase::E_None == aOut.open(osl_File_OpenFlag_Write));
+
+ fprintf(stderr, "rOut is %s\n", rtl::OUStringToOString(rOut, RTL_TEXTENCODING_UTF8).getStr());
+
+ sal_uInt8 in[8192];
+ sal_uInt8 out[8192];
+ sal_uInt64 nBytesRead, nBytesWritten;
+ do
+ {
+ CPPUNIT_ASSERT(osl::FileBase::E_None == aIn.read(in, sizeof(in), nBytesRead));
+ CPPUNIT_ASSERT(rtl_Cipher_E_None == rtl_cipher_decode(cipher, in, nBytesRead, out, sizeof(out)));
+ CPPUNIT_ASSERT(osl::FileBase::E_None == aOut.write(out, nBytesRead, nBytesWritten));
+ CPPUNIT_ASSERT(nBytesRead == nBytesWritten);
+ }
+ while (nBytesRead == sizeof(in));
+
+ rtl_cipher_destroy(cipher);
+}
+
void FiltersTest::recursiveScan(const rtl::OUString &rFilter, const rtl::OUString &rURL, const rtl::OUString &rUserData,
filterStatus nExpected)
{
@@ -51,7 +87,8 @@ void FiltersTest::recursiveScan(const rtl::OUString &rFilter, const rtl::OUStrin
recursiveScan(rFilter, sURL, rUserData, nExpected);
else
{
- rtl::OUString aTmpFile;
+ rtl::OUString sTmpFile;
+ bool bCVE = false;
sal_Int32 nLastSlash = sURL.lastIndexOf('/');
@@ -62,11 +99,23 @@ void FiltersTest::recursiveScan(const rtl::OUString &rFilter, const rtl::OUStrin
{
continue;
}
+
+ if (sURL.matchAsciiL(RTL_CONSTASCII_STRINGPARAM("CVE")), nLastSlash+1)
+ bCVE = true;
}
rtl::OString aRes(rtl::OUStringToOString(sURL,
osl_getThreadTextEncoding()));
+ if (bCVE)
+ {
+ osl::FileBase::RC err = osl::FileBase::createTempFile(NULL, NULL, &sTmpFile);
+ CPPUNIT_ASSERT_MESSAGE("temp File creation failed",
+ err == osl::FileBase::E_None);
+ decode(sURL, sTmpFile);
+ sURL = sTmpFile;
+ }
+
//output name early, so in the case of a hang, the name of
//the hanging input file is visible
if (nExpected == test::indeterminate)
diff --git a/writerfilter/qa/cppunittests/rtftok/data/fail/CVE-2005-2971-1.rtf b/writerfilter/qa/cppunittests/rtftok/data/fail/CVE-2005-2971-1.rtf
index 7ed841f88d7b..5cd42052c657 100644
--- a/writerfilter/qa/cppunittests/rtftok/data/fail/CVE-2005-2971-1.rtf
+++ b/writerfilter/qa/cppunittests/rtftok/data/fail/CVE-2005-2971-1.rtf
Binary files differ
diff --git a/writerfilter/qa/cppunittests/rtftok/data/fail/CVE-2010-3451-1.rtf b/writerfilter/qa/cppunittests/rtftok/data/fail/CVE-2010-3451-1.rtf
index 5cc06e86210f..0c639810d34a 100644
--- a/writerfilter/qa/cppunittests/rtftok/data/fail/CVE-2010-3451-1.rtf
+++ b/writerfilter/qa/cppunittests/rtftok/data/fail/CVE-2010-3451-1.rtf
Binary files differ
diff --git a/writerfilter/qa/cppunittests/rtftok/data/pass/CVE-2005-2964.rtf b/writerfilter/qa/cppunittests/rtftok/data/pass/CVE-2005-2964.rtf
index bf61eeade2a3..da97fba5793c 100644
--- a/writerfilter/qa/cppunittests/rtftok/data/pass/CVE-2005-2964.rtf
+++ b/writerfilter/qa/cppunittests/rtftok/data/pass/CVE-2005-2964.rtf
Binary files differ
diff --git a/writerfilter/qa/cppunittests/rtftok/data/pass/CVE-2005-2972-1.rtf b/writerfilter/qa/cppunittests/rtftok/data/pass/CVE-2005-2972-1.rtf
index c38d6fc644e7..70321707fe0e 100644
--- a/writerfilter/qa/cppunittests/rtftok/data/pass/CVE-2005-2972-1.rtf
+++ b/writerfilter/qa/cppunittests/rtftok/data/pass/CVE-2005-2972-1.rtf
Binary files differ
diff --git a/writerfilter/qa/cppunittests/rtftok/data/pass/CVE-2005-2972-2.rtf b/writerfilter/qa/cppunittests/rtftok/data/pass/CVE-2005-2972-2.rtf
index 2a3f782b72c4..c5ea695bc4fd 100644
--- a/writerfilter/qa/cppunittests/rtftok/data/pass/CVE-2005-2972-2.rtf
+++ b/writerfilter/qa/cppunittests/rtftok/data/pass/CVE-2005-2972-2.rtf
Binary files differ
diff --git a/writerfilter/qa/cppunittests/rtftok/data/pass/CVE-2007-0245-1.rtf b/writerfilter/qa/cppunittests/rtftok/data/pass/CVE-2007-0245-1.rtf
index a166c56e1bd6..757cfe62e85a 100644
--- a/writerfilter/qa/cppunittests/rtftok/data/pass/CVE-2007-0245-1.rtf
+++ b/writerfilter/qa/cppunittests/rtftok/data/pass/CVE-2007-0245-1.rtf
Binary files differ
diff --git a/writerfilter/qa/cppunittests/rtftok/data/pass/CVE-2010-3333-1.rtf b/writerfilter/qa/cppunittests/rtftok/data/pass/CVE-2010-3333-1.rtf
index aaf9acd99a4e..4dac58c0c701 100644
--- a/writerfilter/qa/cppunittests/rtftok/data/pass/CVE-2010-3333-1.rtf
+++ b/writerfilter/qa/cppunittests/rtftok/data/pass/CVE-2010-3333-1.rtf
Binary files differ
diff --git a/writerfilter/qa/cppunittests/rtftok/data/pass/CVE-2010-3452-1.rtf b/writerfilter/qa/cppunittests/rtftok/data/pass/CVE-2010-3452-1.rtf
index b2800b5edbb0..da5d0f39bf82 100644
--- a/writerfilter/qa/cppunittests/rtftok/data/pass/CVE-2010-3452-1.rtf
+++ b/writerfilter/qa/cppunittests/rtftok/data/pass/CVE-2010-3452-1.rtf
@@ -1 +1 @@
-{\rtf1\ansi{\*\pnseclvlÿ}}
+2  ØHv$Èsù£Á …A«óu4”j \ No newline at end of file