Commit graph

2206 commits

Author SHA1 Message Date
Robin Sommer
2fb9efa294 Merge remote-tracking branch 'origin/fastpath'
* origin/fastpath:
  Fix x509-extension test sometimes failing.
2014-02-07 08:07:08 -08:00
Robin Sommer
71df27f9d5 Updating submodule(s).
[nomail]
2014-02-06 20:31:25 -08:00
Robin Sommer
a048082e68 Fixing bug in POP3 analyzer.
With certain input the analyzer could end up trying to write to
non-writable memory.
2014-02-06 20:26:40 -08:00
Robin Sommer
d81bfed45d Fixing memory leaks in input framework. 2014-02-06 17:58:56 -08:00
Robin Sommer
aa90eb0786 Merge remote-tracking branch 'origin/fastpath'
* origin/fastpath:
  Minor unified2 script documentation fix.
2014-02-04 09:10:05 -08:00
Robin Sommer
c671491149 Merge remote-tracking branch 'origin/topic/jdopheid/bro/edits_to_installation_and_getting_started'
* origin/topic/jdopheid/bro/edits_to_installation_and_getting_started:
  Added some grammar and spelling corrections to Installation and Quick Start Guide.
  Minor grammar edits to Installation and Quick Start pages

BIT-1123 #merged
2014-01-31 11:43:25 -08:00
Robin Sommer
d4b5da1597 Merge remote-tracking branch 'origin/topic/jsiwek/http-file-id-caching'
* origin/topic/jsiwek/http-file-id-caching:
  Revert use of HTTP file ID caching for gaps range request content.
  Extend file analysis API to allow file ID caching, adapt HTTP to use it.

BIT-1125 #merged
2014-01-31 08:41:31 -08:00
Robin Sommer
4621745906 Merge remote-tracking branch 'origin/fastpath'
* origin/fastpath:
  Also use exec-module test to check for leaks.
2014-01-30 16:02:22 -08:00
Robin Sommer
9d3d31dbac Merge remote-tracking branch 'origin/topic/bernhard/fix-x509-extensions'
* origin/topic/bernhard/fix-x509-extensions:
  Fix x509_extension event.

BIT-1120 #merged
2014-01-28 10:27:39 -08:00
Robin Sommer
18bd20fe29 Fixing initialization context in anonymous functions.
When an anonymoys function was defined inside an initialization
context, that context transfered over to the function body and could
lead to spurious error messages.
2014-01-23 14:18:30 -08:00
Robin Sommer
d35bee4285 Merge remote-tracking branch 'origin/topic/jsiwek/review-rafael-bro-manual-changes'
* origin/topic/jsiwek/review-rafael-bro-manual-changes:
  Add unit tests for new Bro Manual docs.
  Reformat line width of some docs (i.e. `fmt -72`).
  Pass over doc xref links and linking style.
  New Bro Manual Development Edition and basic.css to fix btest output overflow problem (Update 1).

BIT-1118 #merged
2014-01-22 12:13:53 -08:00
Robin Sommer
ba9571f9ff Merge remote-tracking branch 'origin/topic/jsiwek/gre'
* origin/topic/jsiwek/gre:
  Simplify FragReassembler memory management.
  BIT-867 - Support GRE tunnel decapsulation.

BIT-867 #merged
2014-01-20 12:27:13 -08:00
Robin Sommer
bd63cf2e36 Merge remote-tracking branch 'origin/topic/jazoff/notice_file_info'
* origin/topic/jazoff/notice_file_info:
  Include file information in notices

BIT-1113 #merged

I'm wondering if there's a way to test creating these emails ... ?
2014-01-20 12:01:44 -08:00
Robin Sommer
04a974f208 Merge remote-tracking branch 'origin/topic/jazoff/ssl-validation-fix'
* origin/topic/jazoff/ssl-validation-fix:
  fix the caching of recently validated certs

BIT-1114 #merged
2014-01-20 11:55:32 -08:00
Robin Sommer
1c9c1147a0 Merge remote-tracking branch 'origin/topic/jazoff/suppression'
* origin/topic/jazoff/suppression:
  change Notice::suppressing to be a table of times

BIT-1115 #merged
2014-01-20 11:53:29 -08:00
Robin Sommer
32707c6c62 Merge remote-tracking branch 'origin/topic/jsiwek/libmagic-integration'
* origin/topic/jsiwek/libmagic-integration:
  Don't use LOG_* options to ExternalProject_Add if not supported.
  Integrate libmagic 5.16 via CMake ExternalProject.

BIT-1116 #merged
2014-01-20 11:42:58 -08:00
Robin Sommer
69ef268a44 Fixing compile problems with some versions of libc++.
Reported by Craig Leres.
2014-01-13 09:31:23 -08:00
Robin Sommer
ca55d14f67 Merge remote-tracking branch 'origin/fastpath'
* origin/fastpath:
  Improve GeoIP City database support.
  Broxygen init fixes, addresses BIT-1110.
  Fix for packet writing to make it use the global snaplength.
  Fix for traffic with TCP segmentation offloading with IP header len field being set to zero.
2014-01-13 01:38:56 -08:00
Robin Sommer
ae9e0d4cb6 Fixing segfault with mismatching set &default in record field. 2013-12-18 09:17:05 -08:00
Robin Sommer
207b7e7102 Merge remote-tracking branch 'origin/fastpath'
* origin/fastpath:
  Improve warnings emitted from raw/execute input reader.
2013-12-16 08:50:54 -08:00
Robin Sommer
928a5881b1 Merge remote-tracking branch 'origin/fastpath'
* origin/fastpath:
  Another attempt to improve core.when-interpreter-exceptions unit test.
2013-12-12 07:13:33 -08:00
Robin Sommer
6c20df11cc Merge remote-tracking branch 'origin/fastpath'
* origin/fastpath:
  Fix uninitialized field in basename/dirname util wrapper.
2013-12-10 15:03:22 -08:00
Robin Sommer
e8739f785b Merge remote-tracking branch 'origin/topic/bernhard/input-error-fixes'
* origin/topic/bernhard/input-error-fixes:
  Several fixes for input manager error handling.

BIT-1106 #merged
2013-12-09 15:21:18 -08:00
Robin Sommer
49a3d53970 Updating submodule(s).
[nomail]
2013-12-09 13:54:23 -08:00
Robin Sommer
ca37f3d2dd Merge remote-tracking branch 'origin/topic/jsiwek/misc-fixes'
BIT-1105 #merged

* origin/topic/jsiwek/misc-fixes:
  Fix table &default reference counting for record ctor expressions.
  Close signature files after done parsing.
  Fix unlikely null ptr deref in broxygen::Manager.
  FreeBSD build fix addendum: unintended variable shadowing.
  Fix build on FreeBSD.
2013-12-09 13:26:47 -08:00
Robin Sommer
574018f478 Merge remote-tracking branch 'origin/fastpath'
* origin/fastpath:
  Improve a unit test involving 'when' conditionals.
2013-12-05 07:54:18 -08:00
Robin Sommer
1732fd77a4 Updating CHANGES and VERSION. 2013-12-05 07:53:26 -08:00
Robin Sommer
dda5e43aa9 Merge branch 'topic/robin/string-slicing-fix' 2013-12-04 12:42:22 -08:00
Robin Sommer
320f2d5ab6 Merge remote-tracking branch 'origin/topic/bernhard/ssl_ciphers_vector'
BIT-1011 #merged

* origin/topic/bernhard/ssl_ciphers_vector:
  Change ciphers in changes ciphers from a set to a vector.
2013-12-04 12:17:22 -08:00
Robin Sommer
dadfcde70e Merge branch 'topic/robin/event-dumper'
Changes:

   - Changing semantics of the new_event() meta event: it's raised
     only for events that have a handler defined. There are too many
     checks in Bro that prevent events wo/ handler from being even
     prepared to raise to do that differently.

   - Adding test case.

* topic/robin/event-dumper:
  New script misc/dump-events.bro, along with core support, that dumps events Bro is raising in an easily readable form.
  Prettyfing Describe() for record types.
2013-12-04 12:13:07 -08:00
Robin Sommer
18a23fbdb8 Merge remote-tracking branch 'origin/topic/jsiwek/string-slicing-fix'
* origin/topic/jsiwek/string-slicing-fix:
  Fix string slice notation, addresses BIT-1097.
2013-12-04 11:23:26 -08:00
Robin Sommer
3abf626908 Merge remote-tracking branch 'origin/topic/jsiwek/broxygen'
BIT-1098

* origin/topic/jsiwek/broxygen:
  Fix Broxygen-related compile errors.
  Add a Broxygen coverage test.
  Internal Broxygen organization/documentation/polish.
  Add unit tests for Broxygen config file targets.
  Change Broxygen config file format.
  Broxygen doc-related test updates.  Fix two regressions.
  A couple documentation fixes.
  Integrate new Broxygen functionality into Sphinx.
  Implement majority of Broxygen features delegated to Bro.
  Broxygen can now read a config file specifying particular targets.
  Remove unneeded Broxygen comments in scan.bro.
  Replace safe_basename/safe_dirname w/ SafeBasename/SafeDirname.
  Add BIF interface for retrieving comments/docs.
  Quick optimization to Broxygen doc gathering.
  Flesh out Broxygen doc-gathering skeleton.
  Refactor search_for_file() util function.
  Initial skeleton of new Broxygen infrastructure.
2013-12-04 11:14:19 -08:00
Robin Sommer
c0b8384660 Merge remote-tracking branch 'origin/topic/jsiwek/broccoli-vectors'
* origin/topic/jsiwek/broccoli-vectors:
  Unit test for broccoli vector support.
2013-12-03 10:57:03 -08:00
Robin Sommer
dc52846b6f Updating submodule(s).
[nomail]
2013-11-18 14:04:02 -08:00
Robin Sommer
f18f9511ac Updating submodule(s).
[nomail]
2013-11-15 07:06:00 -08:00
Robin Sommer
3d1fd6ca5e Merge remote-tracking branch 'origin/fastpath'
* origin/fastpath:
  Fix the irc_reply event for certain server message types.
2013-11-11 13:48:50 -08:00
Robin Sommer
ba258ab865 Updating CHANGES and VERSION. 2013-11-07 01:21:20 -08:00
Robin Sommer
da9c31db55 Fixing warnings during doc build.
Includes adding a stub file that has been missing for a while already.
2013-11-07 00:46:48 -08:00
Robin Sommer
f46e4a5578 Merge remote-tracking branch 'origin/fastpath'
* origin/fastpath:
  Fix typos in sumstats doc and update doc test
  Update docs and tests for a recent change to detect-MHR.bro
  Update tests and baselines for sumstats docs
2013-11-06 22:55:01 -08:00
Seth Hall
0a1ee9af1b Merge remote-tracking branch 'origin/topic/vladg/ssh-log-fix'
* origin/topic/vladg/ssh-log-fix:
  Remove resp_size from the log. Refactor when we write out to the log a bit. Geodata now works reliably.
  Fix resp_size in ssh.log, require a minimum resp_size for the heuristic. Some work on geodata, but still a WIP.
2013-11-06 14:42:02 -05:00
Robin Sommer
886266e8af Merge remote-tracking branch 'origin/fastpath'
* origin/fastpath:
  Remove swig-ruby from required packages section of install doc
2013-11-03 22:53:54 -08:00
Robin Sommer
a9d8748614 Updating submodule(s).
[nomail]
2013-11-01 05:26:32 -07:00
Robin Sommer
101fbdeff7 Adding source and original copyright statement to Mozilla cert list. 2013-11-01 05:24:43 -07:00
Robin Sommer
5f863df91f Canonfying an intel test to not depend on output order. 2013-11-01 05:03:54 -07:00
Robin Sommer
49f31acebe Merge remote-tracking branch 'origin/topic/jsiwek/thread-termination'
* origin/topic/jsiwek/thread-termination:
  Fix thread processing/termination conditions.

BIT-1093 #merged
2013-10-30 05:05:06 -07:00
Robin Sommer
601b1b9fd0 Merge branch 'master' of git.bro.org:bro 2013-10-29 09:31:59 -07:00
Robin Sommer
943f44314a Merge remote-tracking branch 'origin/fastpath'
* origin/fastpath:
  Don't build broccoli ruby bindings by default, use --enable-ruby to do so.
  Revert "Fix race condition in unit test."
  Fix race condition in unit test.
  Change percent_lost in capture-loss from a string to a double.
2013-10-29 09:28:13 -07:00
Vlad Grigorescu
e1d2f6d82f Change percent_lost in capture-loss from a string to a double. 2013-10-29 06:03:34 -07:00
Robin Sommer
fbdbe6d35b Merge remote-tracking branch 'origin/fastpath'
* origin/fastpath:
  Add curl to list of optional dependencies
  Update test and baseline for a recent doc test fix
2013-10-25 15:48:45 -07:00
Robin Sommer
be5b0105b0 Updating README with download/git information.
The git instructions were hard to find and this way they will show up
on github.
2013-10-25 15:06:13 -07:00