Commit graph

1798 commits

Author SHA1 Message Date
Jon Siwek
d661ccfc8e Tweaks for OpenBSD support.
- Add note about top-level Makefile possibly lacking OpenBSD support.
- Extend config.h with missing/different preprocessor definitions
2012-01-06 11:39:38 -06:00
Robin Sommer
e5b3d318a6 Merge remote-tracking branch 'origin/topic/seth/ssl-improvements'
* origin/topic/seth/ssl-improvements:
  Removed the SSLv2.cc file since it's not used.
  Added the ssl_session_ticket_handshake event back.
  Added the ssl_session_ticket_handshake event and fixed a few SSL bugs.
2012-01-04 12:48:39 -08:00
Robin Sommer
0ca6e492b3 Merge branch 'master' of ssh://git.bro-ids.org/bro 2012-01-04 12:45:42 -08:00
Robin Sommer
aa4cc3c4a1 Adding top-level "test" target to Makefile. 2012-01-04 12:34:36 -08:00
Robin Sommer
ba30713ec4 Adding SWIG as dependency to INSTALL.
And a bit of polishing.
2012-01-04 12:30:54 -08:00
Seth Hall
e5bb76e684 Removed the SSLv2.cc file since it's not used. 2012-01-04 14:51:19 -05:00
Seth Hall
0b93b071ea Added the ssl_session_ticket_handshake event back. 2012-01-04 13:53:26 -05:00
Seth Hall
3d0722f0e5 Merge branch 'master' into topic/seth/ssl-improvements
Conflicts:
	src/event.bif
	src/ssl-protocol.pac
2012-01-04 13:51:31 -05:00
Seth Hall
f8ec98625d Merge remote-tracking branch 'origin/topic/robin/pp-alarms'
* origin/topic/robin/pp-alarms:
  The silliest, tiniest little whitespace fixes.
  Update missing in last commit to this branch.
  Adding test for alarm mail.
  Tuning the pretty-printed alarms output.
2012-01-04 13:41:28 -05:00
Seth Hall
adfbed8e56 The silliest, tiniest little whitespace fixes. 2012-01-04 13:37:07 -05:00
Robin Sommer
167b645ed0 Updating submodule(s).
[nomail]
2012-01-03 15:58:15 -08:00
Robin Sommer
358db60503 Merge remote-tracking branch 'origin/topic/jsiwek/remove-refined-type'
* origin/topic/jsiwek/remove-refined-type:
  Remove dead code related to record type inheritance.
2012-01-03 15:42:44 -08:00
Robin Sommer
8200544293 Updating test baselines for log change 2012-01-03 15:29:25 -08:00
Robin Sommer
5e9153d7d6 Merge remote-tracking branch 'origin/topic/bernhard/notice-proto'
* origin/topic/bernhard/notice-proto:
  log protocol in notices.

Conflicts:
	scripts/base/frameworks/notice/main.bro

Closes #718.
2012-01-03 14:52:07 -08:00
Robin Sommer
5435dcbfb1 Merge remote-tracking branch 'origin/fastpath'
* origin/fastpath:
  CMake 2.6 top-level 'install' target compat. (fixes #729)
  Minor fixes to external test process. (addresses #298)
  Increase timeout interval of communication-related btests.

Closes #729.
Closes #298.
2012-01-03 14:48:15 -08:00
Jon Siwek
0cd03986a1 CMake 2.6 top-level 'install' target compat. (fixes #729) 2012-01-03 10:56:33 -06:00
Jon Siwek
ff1768f857 Minor fixes to external test process. (addresses #298)
- Skip diffing of debug.log always.
- Skip diffing of reporter.log if it only contains an error about
  missing GeoIP support.
- Canonicalize X.509 Distinguished Name subjects since that can vary
  depending on installed OpenSSL version.
2011-12-20 11:47:39 -06:00
Jon Siwek
eeceb14c1a Merge branch 'master' into fastpath 2011-12-20 11:45:50 -06:00
Jon Siwek
436be4e07b Remove dead code related to record type inheritance. 2011-12-19 15:06:52 -06:00
Robin Sommer
43124d4b1c Update one more baseline. 2011-12-19 11:37:51 -08:00
Robin Sommer
8199d85d6a Updating submodule(s). 2011-12-19 11:27:29 -08:00
Jon Siwek
578cd06176 Increase timeout interval of communication-related btests.
This may help clear up some transient test failures on the NMI testbed.
2011-12-19 13:12:02 -06:00
Robin Sommer
3ac4ff6b42 Updates for log format changes. 2011-12-19 09:09:32 -08:00
Robin Sommer
c81477d9d3 Executive decision: empty fields are now logged as "(empty)" by default. 2011-12-19 08:49:30 -08:00
Robin Sommer
c1e656d89e In log headers, only escape information when necessary. 2011-12-19 08:44:41 -08:00
Robin Sommer
a9f0b10e2e Updating baselines for recent commits. 2011-12-19 07:44:29 -08:00
Robin Sommer
26ff8e1dab Merge remote branch 'origin/topic/seth/notice-email-delay'
* origin/topic/seth/notice-email-delay:
  The hostname notice email extension works now.
  Fixed more bugs with delayed emails.
  Working around a problem with setting default container types.
  Ugh, still major failure.  I'm just cutting the timeout handling for now.
  Fixed a small bug major problem with email delay timeout catching.
  Initial fixes for the problem of async actions with notice email extensions.

Closes #727.
2011-12-19 07:10:28 -08:00
Robin Sommer
01e4588737 Merge remote branch 'origin/topic/jsiwek/record-coerce-default'
* origin/topic/jsiwek/record-coerce-default:
  Fix &default fields in records not being initialized in coerced assignments.

Closes #722.
2011-12-19 06:54:32 -08:00
Robin Sommer
5ee605f244 Merge remote branch 'origin/topic/bernhard/log-set-description'
* origin/topic/bernhard/log-set-description:
  update baseline
  make LogWriter output the type of data stored inside a set or vector.
2011-12-19 06:39:02 -08:00
Robin Sommer
3220bbce55 Merge remote branch 'origin/topic/jsiwek/log-escaping'
* origin/topic/jsiwek/log-escaping:
  Add missing ascii writer options to log header.
  Escape the ASCII log's set separator (addresses #712)
  Rewrite ODesc character escaping functionality. (addresses #681)

Closes #712.
2011-12-19 06:37:54 -08:00
Robin Sommer
0a3e160a8d Merge remote branch 'origin/topic/seth/dns-updates'
* origin/topic/seth/dns-updates:
  Fixed some bugs with capturing data in the base DNS script.
  Some updates to the base DNS script.

Closes #702.
2011-12-18 15:20:00 -08:00
Robin Sommer
f3c2811e14 Merge remote branch 'origin/topic/seth/ssl-updates-for-2.0'
* origin/topic/seth/ssl-updates-for-2.0:
  Added is_orig fields to the SSL events and adapted script.

Closes #692.
2011-12-18 15:15:57 -08:00
Robin Sommer
719557a05b Merge remote branch 'origin/fastpath'
* origin/fastpath:
  Enable warnings for malformed Broxygen xref roles.
  Broxygen fix for function parameter recognition; better than 80b2451.
  Allow Broxygen markup "##<" for more general use.
2011-12-18 15:10:49 -08:00
Jon Siwek
23177aa081 Enable warnings for malformed Broxygen xref roles. 2011-12-16 14:36:15 -06:00
Jon Siwek
8394829fb1 Broxygen fix for function parameter recognition; better than 80b2451. 2011-12-16 11:59:55 -06:00
Jon Siwek
3b91df8cf5 Allow Broxygen markup "##<" for more general use. 2011-12-16 11:21:49 -06:00
Seth Hall
8399d28c2e The hostname notice email extension works now. 2011-12-16 10:59:30 -05:00
Robin Sommer
41a68933eb Updating submodule(s). 2011-12-16 02:59:39 -08:00
Robin Sommer
84e6caed2c Merge remote branch 'origin/master'
* origin/master:
  Cleanup some misc Broxygen css/js stuff.
  Add search box to Broxygen docs (fixes #726).

Some markup for the tracker to close the recently addresses tickets:

Closes #726.
Closes #433.
Closes #311.
Closes #664.
2011-12-16 02:41:43 -08:00
Robin Sommer
8c53446292 Merge remote branch 'origin/fastpath'
* origin/fastpath:
  Fixed major bug with cluster synchronization (it was broken!)
2011-12-16 02:37:56 -08:00
Robin Sommer
4e17ef63f0 Merge remote branch 'origin/fastpath'
* origin/fastpath:
  Fix missing action in notice policy for looking up GeoIP data.
  Better persistent state config warning messages (fixes #433).
  A few updates for SQL injection detection.
  Fixed some DPD signatures for IRC.  Fixes ticket #311.
  Removing Off_Port_Protocol_Found notice.
  SSH::Interesting_Hostname_Login cleanup.  Fixes #664.
  Teach Broxygen to more generally reference attribute values by name.
  Fixed a really dumb bug that was causing the malware hash registry script to break.
  Fix Broxygen confusing scoped id at start of line as function parameter.
  Remove remnant of libmagic optionality
2011-12-16 02:36:43 -08:00
Seth Hall
0b8b14a0ed Fixed major bug with cluster synchronization (it was broken!) 2011-12-15 15:59:51 -05:00
Seth Hall
b66c73baaa Fixed more bugs with delayed emails. 2011-12-15 15:57:42 -05:00
Jon Siwek
fc9a38a796 Cleanup some misc Broxygen css/js stuff. 2011-12-15 13:01:23 -06:00
Jon Siwek
d04558dc45 Add search box to Broxygen docs (fixes #726). 2011-12-15 13:00:29 -06:00
Jon Siwek
f302f2f3f2 Fix &default fields in records not being initialized in coerced assignments.
Addresses #722
2011-12-15 12:16:42 -06:00
Seth Hall
667dcb251a Working around a problem with setting default container types. 2011-12-15 12:51:14 -05:00
Seth Hall
cb904cec4f Ugh, still major failure. I'm just cutting the timeout handling for now. 2011-12-15 12:46:15 -05:00
Seth Hall
f1f5719f83 Fixed a small bug major problem with email delay timeout catching. 2011-12-15 12:41:05 -05:00
Seth Hall
2d97e25eeb Initial fixes for the problem of async actions with notice email extensions. 2011-12-15 12:27:41 -05:00