Commit graph

8227 commits

Author SHA1 Message Date
Kevin Lin
35aa42f5a1 ole2: check for json outputting option 2014-04-23 18:15:29 -04:00
Kevin Lin
dcddbb6844 ole2: removed comments 2014-04-23 17:46:34 -04:00
Kevin Lin
4f4656626b Merge branch 'master' of git.clam.sourcefire.com:/var/lib/git/clamav-devel 2014-04-23 17:45:41 -04:00
Kevin Lin
cecc57a98b ole2: removed unused code and debugging comments 2014-04-23 17:41:27 -04:00
Kevin Lin
2a3d247b9e json: various fixes for disabled json 2014-04-23 17:37:23 -04:00
Steven Morgan
ac7cd0086e Merge branch 'master' of git.clam.sourcefire.com:/var/lib/git/clamav-devel 2014-04-23 16:57:21 -04:00
Steven Morgan
694da93102 doc for using icon groups in .ldb signatures 2014-04-23 16:56:08 -04:00
Shawn Webb
d08a757a93 Add OpenSSL legal text to NEWS and README 2014-04-23 16:46:06 -04:00
Steven Morgan
a7abcc637d Merge branch 'master' of git.clam.sourcefire.com:/var/lib/git/clamav-devel 2014-04-23 16:18:54 -04:00
Steven Morgan
0b8a88c80c clamdoc updates for 0.98.2 2014-04-23 16:18:21 -04:00
Kevin Lin
e428cb08d2 doc/ppt/xls: re-classify filetype on appname detection 2014-04-23 16:14:30 -04:00
Kevin Lin
a7318e95a3 Merge branch 'master' of git.clam.sourcefire.com:/var/lib/git/clamav-devel 2014-04-23 11:48:23 -04:00
Kevin Lin
4e68362813 libclamav: added JSON object management for embedded objects
doc/ppt/xls: redirected JSON output to working object
2014-04-23 11:47:40 -04:00
Steven Morgan
0f2d9aebb6 NEWS for 0.98.2 2014-04-22 17:53:12 -04:00
Kevin Lin
a094a72931 json_api: added NULLARG checks 2014-04-22 15:52:31 -04:00
Kevin Lin
849a2cef36 json: added parent object NULL check
ole2: fixed a minor issue
2014-04-22 14:58:38 -04:00
Kevin Lin
6036bbf178 json_api: added source to windows build 2014-04-22 14:42:02 -04:00
Kevin Lin
0292d5f07f Merge branch 'master' of git.clam.sourcefire.com:/var/lib/git/clamav-devel 2014-04-22 14:23:57 -04:00
Kevin Lin
9fdbf2c73a json: added json api source files, source moved from ole2 specifics 2014-04-22 14:22:39 -04:00
Steven Morgan
10c1c02ee7 Merge branch 'master' of git.clam.sourcefire.com:/var/lib/git/clamav-devel 2014-04-22 13:22:37 -04:00
Steven Morgan
4be1c877db another freebsd/libjson-c dependency: clambc 2014-04-22 13:20:05 -04:00
Shawn Webb
8ea39a0f0f Dummy commit to test buildbot 2014-04-22 12:28:05 -04:00
Kevin Lin
a2a9993cd7 xls: added OTF SummaryInfo and DocumentSummary streams parsing support 2014-04-21 18:40:32 -04:00
Kevin Lin
4c37996842 doc/ppt: moved information stream parsing from vba source to ole2 source 2014-04-21 18:30:28 -04:00
Kevin Lin
09dddc5be3 doc/ppt: added SummaryInfo and DocumentSummary streams parsing, JSON or debug 2014-04-21 16:44:26 -04:00
Steven Morgan
0591c7ccc9 change clamdtop for building with libjson. 2014-04-21 10:35:18 -04:00
Steven Morgan
7dddcb12e1 fix typo in last commit: add dependency for clamav-milter on freebsd w/libjson support. 2014-04-18 17:53:59 -04:00
Steven Morgan
b8539c47d1 add dependency for clamav-milter on freebsd w/libjson support. 2014-04-18 17:06:15 -04:00
Steven Morgan
731507f9b6 add dependency for clamconf on freebsd w/libjson support. 2014-04-18 15:36:35 -04:00
Steven Morgan
f8708da806 bz#10974 fix for false negative with lzma compression within xar files. 2014-04-18 12:07:52 -04:00
Steven Morgan
2ba813812e fix compile w/libjson of freshclam on freebsd. 2014-04-17 18:33:13 -04:00
Steven Morgan
185368357c more fixes for freebsd build with json. 2014-04-17 17:15:58 -04:00
Steven Morgan
9253ae3df5 libjson build changes for freebsd 2014-04-17 15:59:04 -04:00
Steven Morgan
8d9beb4f02 change json #include. 2014-04-17 14:41:03 -04:00
Shawn Webb
a9024c0999 Merge remote-tracking branch 'origin/master' 2014-04-17 09:30:04 -04:00
Shawn Webb
5628bc8500 Add verbiage regarding linking OpenSSL 2014-04-17 09:29:47 -04:00
Steven Morgan
fef6c2b95a make json library optional. 2014-04-16 18:14:45 -04:00
Steven Morgan
e56f094920 Add build support for libjson and initial json work for properties file. 2014-04-16 16:40:56 -04:00
Shawn Webb
49bc49921f Start basic PDF stats code for use later 2014-04-16 14:23:16 -04:00
Shawn Webb
25a64ec0e1 Check for NULL allocation 2014-04-15 10:27:34 -04:00
Shawn Webb
99ee2138c4 Key off INT_MAX 2014-04-15 10:24:58 -04:00
Shawn Webb
c6f5ef98d6 bb #10970 - Force a filesize limit of UINT_MAX - 2 2014-04-11 13:41:22 -04:00
Shawn Webb
15a8a022d4 Retab and minorly refactor PDF handling code 2014-04-07 16:39:54 -04:00
Steven Morgan
b13311968e update Changelog for 0.98.2 branch. 2014-04-04 18:07:37 -04:00
Shawn Webb
973d311503 Initialize the opened variable in the right spot 2014-04-04 15:56:37 -04:00
Shawn Webb
63fb654bfd NSIS - If the file to be scanned is reported to be of zero length, don't scan it. 2014-04-04 14:51:49 -04:00
Shawn Webb
e1f1bc6268 Restart recv call if EINTR is hit 2014-04-02 11:49:09 -04:00
Shawn Webb
0381941790 Fix linking with OpenSSL on Ubuntu 14.04 2014-03-31 11:47:42 -04:00
Shawn Webb
77a04a7fc3 Fix bug in the case of no libxml2 2014-03-31 11:34:34 -04:00
Shawn Webb
2f91ff3764 Add version info to clamsubmit 2014-03-28 12:23:23 -04:00