Commit graph

271 commits

Author SHA1 Message Date
Gregor Maier
2aae4eaf91 New fix for OS X 10.5 compile error wrt llabs() 2011-02-09 15:52:32 -08:00
Gregor Maier
104c7da205 Revert "Fix for OS X 10.5 compile error wrt llabs()"
This reverts commit 3f6aa735e9.

Using abs() does not work if the integer is >2^32 (or <2^32).
Will add a new fix in next commit.
2011-02-09 15:40:36 -08:00
Robin Sommer
2f7fa3470b Merge remote branch 'origin/topic/seth/fix-compiler-warnings'
* origin/topic/seth/fix-compiler-warnings:
  Fixed problem with PRI macros.
  PRI macros are currently not working for some reason.
  Two more small compile time error fixes.
  Cleaned up the output from running binpac.
  Added line to expect shift/reduce errors in parse.in
  Cleaned up g++ warnings.

Addition: I fixed a few more warnings I was getting, and tweaked some
of the existing changes slightly.
2011-02-09 08:10:41 -08:00
Robin Sommer
bf76811776 Merge remote branch 'remotes/origin/topic/robin/work'
* remotes/origin/topic/robin/work:
  *Now* this passes the test suite.
  Fixes to SSL/TLS analyzer
  Added new TLS ciphers
  Removing some apparently unnecessary lines.
  A few smaller tweaks.
  Prepared the old analyzer for extracting SSL extensions.
  Fixed bug in do_split implementation.
  Removed an accidental debugging printf.
  Readded the other changes to remove CheckString calls from strings.bif.
  Fixed the problem with do_split function which caused it to bail 1 separator early.
  Modification from rmkml to support SSL extensions.
  Updated SSL analyzer and Bro script with lots of new ciphers.
2011-02-08 20:25:13 -08:00
Robin Sommer
53940f0a1c Merge remote branch 'remotes/origin/topic/seth/strings-without-checkstring' into topic/robin/work
* remotes/origin/topic/seth/strings-without-checkstring:
  *Now* this passes the test suite.
  Removing some apparently unnecessary lines.
  A few smaller tweaks.
  Fixed bug in do_split implementation.
  Removed an accidental debugging printf.
  Readded the other changes to remove CheckString calls from strings.bif.
  Fixed the problem with do_split function which caused it to bail 1 separator early.
2011-02-08 19:36:32 -08:00
Seth Hall
b54445b725 Fixed problem with PRI macros.
Thanks Gregor!
2011-02-08 20:28:56 -05:00
Robin Sommer
337379c1b2 Merge remote branch 'origin/topic/seth/ssl-analyzer-work' into topic/robin/work
* origin/topic/seth/ssl-analyzer-work:
  Fixes to SSL/TLS analyzer
  Added new TLS ciphers
  Prepared the old analyzer for extracting SSL extensions.
  Modification from rmkml to support SSL extensions.
  Updated SSL analyzer and Bro script with lots of new ciphers.
2011-02-08 16:26:01 -08:00
Robin Sommer
888719e922 Adding new aux/btest submodule. 2011-02-08 14:28:15 -08:00
Seth Hall
275c6e64cc PRI macros are currently not working for some reason. 2011-02-08 12:47:10 -05:00
Robin Sommer
0d9de7d719 Updating submodule(s). 2011-02-07 14:07:29 -08:00
Robin Sommer
abc365e38f Merge remote branch 'origin/topic/robin/work'
* origin/topic/robin/work:
  Smarter way to increase the parent/child pipe's socket buffer. (Craig Leres).
  Fixing bug with defining bro_int_t and bro_uint_t as 64-bit in some platforms.
2011-02-07 13:44:45 -08:00
Robin Sommer
4d12ac861d Smarter way to increase the parent/child pipe's socket buffer. (Craig
Leres).

This is from #383.
2011-02-04 17:58:19 -08:00
Robin Sommer
51b3efbb1a Fixing bug with defining bro_int_t and bro_uint_t as 64-bit in some
platforms.
2011-02-04 17:39:38 -08:00
Robin Sommer
ee6abcba72 Updating submodule(s). 2011-02-03 21:57:11 -08:00
Robin Sommer
e00acaddd8 Login's confused messages now go through weird.bro. 2011-01-31 16:42:36 -08:00
Robin Sommer
88b31a04d0 Updating submodule(s). 2011-01-31 15:36:01 -08:00
Seth Hall
65687d86d8 *Now* this passes the test suite.
I got the last fix wrong and I was still misunderstanding
one behavior of the existing do_split function.  When a
separator match goes to the last character of the string,
a blank string element should be appended to the
string_array to indicate that a successful split occurred.
2011-01-31 12:19:11 -05:00
Robin Sommer
7432761558 Updating submodule(s). 2011-01-31 08:48:41 -08:00
Robin Sommer
7de348da11 Merge remote branch 'origin/topic/jsiwek/missing-config-options'
* origin/topic/jsiwek/missing-config-options:
  Adding more configure options for finding dependencies

Conflicts:
	aux/binpac
2011-01-31 08:48:12 -08:00
Seth Hall
1ccfca09ac Fixes to SSL/TLS analyzer
Analyzer can cope with zero length client and server
certificates.  It does still generate a weird though.
Extended cipherspec_size weirds are not thrown anymore,
they are incredibly overwhelming and should be handled
completely at the scripting in my opinion.

Integrated and expanded on patch Rmkml from ticket #209
that fixes problem with not parsing or expecting SSL
extensions.  SSL extensions still are not extracted
and passed to script land, but the analyzer doesn't
fail anymore.
2011-01-28 16:24:07 -05:00
Seth Hall
c8076619ce Added new TLS ciphers 2011-01-28 16:18:57 -05:00
Robin Sommer
4b77164e04 Merge remote branch 'origin/fastpath'
* origin/fastpath:
  Fix typo in PCAPTests.cmake
2011-01-28 08:14:34 -08:00
Jon Siwek
da3fb85e5c Adding more configure options for finding dependencies 2011-01-28 10:10:16 -06:00
Jon Siwek
a19391b94b Fix typo in PCAPTests.cmake
With this correction, the configure tests should now be pulling
in the correct user-specified libpcap headers
2011-01-27 11:35:35 -06:00
Robin Sommer
91d7c48ced Updating submodule(s). 2011-01-25 17:58:09 -08:00
Robin Sommer
8974265d39 Fixing bug in SMB analyzer. 2011-01-24 15:29:40 -08:00
Robin Sommer
2bf7461d9c Updating submodule(s). 2011-01-24 15:21:39 -08:00
Robin Sommer
f4c6642f4d Merge remote branch 'origin/topic/jsiwek/reconfigure'
* origin/topic/jsiwek/reconfigure:
  Configure wrapper now deletes previous CMake cache
  Fix for the --with-binpac configure option
2011-01-24 14:56:58 -08:00
Seth Hall
6418283371 Two more small compile time error fixes. 2011-01-24 13:43:49 -05:00
Jon Siwek
4817f7de4e Configure wrapper now deletes previous CMake cache 2011-01-24 11:26:29 -06:00
Jon Siwek
4da36217b7 Fix for the --with-binpac configure option
Compiling from existing sources no longer overrides this option.
2011-01-24 11:02:16 -06:00
Seth Hall
0fe30453cf Removing some apparently unnecessary lines. 2011-01-21 20:59:51 -05:00
Robin Sommer
fa87a81a96 Merge remote branch 'origin/topic/jsiwek/add-config-status'
* origin/topic/jsiwek/add-config-status:
  Changed configure wrapper to create config.status
2011-01-20 16:35:24 -08:00
Robin Sommer
2951e9c97c Merge remote branch 'origin/topic/small_remote_connection_fix'
Closes #86.

* origin/topic/small_remote_connection_fix:
  Fixed a small problem in the remote serialization code.
2011-01-20 16:31:07 -08:00
Robin Sommer
668824d1b6 A few smaller tweaks. 2011-01-20 14:36:07 -08:00
Robin Sommer
5035a4346a Fixing inconsistent CHANGES layout. 2011-01-20 13:57:04 -08:00
Robin Sommer
9cea6c5b01 Some small tweaks to the HTTP analyzer.
From ticket #339.
2011-01-20 13:54:54 -08:00
Seth Hall
05f27c5441 Fixed a small problem in the remote serialization code.
This is from ticket #86.  It needs verified, but everything
seemed to work the same (except for the bug!) with the
change.
2011-01-20 16:30:16 -05:00
Seth Hall
be5027c316 Merge branch 'master' into topic/seth/fix-compiler-warnings 2011-01-20 15:15:13 -05:00
Seth Hall
fbf7d5ccc0 Cleaned up the output from running binpac.
Added an extra dependency to the dce_rpc pac files
and running binpac with the -q (quiet) flag which
requires changes to binpac which will be committed
soon.
2011-01-20 15:10:31 -05:00
Seth Hall
b7b29c6f92 Added line to expect shift/reduce errors in parse.in
This is the resolution that Gregor brought up in
December, 2010 on the bro-dev list.
2011-01-20 15:08:54 -05:00
Seth Hall
ef1650f6a2 Cleaned up g++ warnings. 2011-01-20 15:07:24 -05:00
Jon Siwek
bbe078e06c Changed configure wrapper to create config.status 2011-01-20 12:37:38 -06:00
Robin Sommer
0a3f84681a Updating submodules. 2011-01-19 18:12:41 -08:00
Robin Sommer
814cb0f091 Merge remote branch 'origin/topic/jsiwek/macports-fink-fix'
Conflicts:
	aux/broccoli
	aux/broctl
2011-01-19 18:09:58 -08:00
Robin Sommer
420d8ac4b7 Merge remote branch 'origin/topic/jsiwek/packaging'
* origin/topic/jsiwek/packaging:
  Changed behavior of how binary packaging installs config files.
2011-01-19 18:07:38 -08:00
Robin Sommer
75335b933e Removing global_attrs from parser, per #11, and also record
attributes. Both aren't used anywhere. Along with these goes some
more now unused code.

Closes #11.
2011-01-19 18:00:09 -08:00
Seth Hall
e1ab9b1c69 Pattern construction BiFs will now work if no packets have been read. 2011-01-19 18:00:01 -08:00
Robin Sommer
fa7654ec75 Merge remote branch 'origin/topic/robin/entropy'
* origin/topic/robin/entropy:
  A few smaller tweaks.
  Applying Seth's patch from #265 adding entropy BiFs.
2011-01-19 17:38:29 -08:00
Robin Sommer
8e7d0617a1 Merge remote branch 'remotes/origin/topic/bro_dns_fake_message'
* remotes/origin/topic/bro_dns_fake_message:
  Reworded BRO_DNS_FAKE message.
  Added a BRO_DNS_FAKE message to the help output.

Changed to show on/off rather than the variable's content.
2011-01-19 17:31:00 -08:00