Commit graph

7121 commits

Author SHA1 Message Date
Seth Hall
d32e4b25f1 Small change to avoid potentially over reading memory. 2017-02-03 12:34:39 -08:00
Seth Hall
59f0477d29 Implement ERSPAN support.
This is a small caveat to this implementation.  The ethernet
header that is carried over the tunnel is ignored.  If a user
tries to do MAC address logging, it will only show the MAC
addresses for the outer tunnel and the inner MAC addresses
will be stripped and not available anywhere.
2017-02-03 12:29:22 -08:00
Seth Hall
cd1f3114b7 Merge branch 'topic/seth/BIT-1781'
* topic/seth/BIT-1781:
  New file types sigs from Keith Lehigh.

Closes BIT-1781
2017-02-01 10:09:33 -05:00
Seth Hall
645ec39f4b New file types sigs from Keith Lehigh. 2017-01-31 23:33:58 -05:00
Johanna Amann
6487446f27 Change snaplen of test trace from 1,000,000 to 10,000
Recent versions of libpcap are unhappy with values bigger than 262,144
and will refuse reading the file.
2017-01-31 13:10:36 -08:00
Johanna Amann
572c9b49fd Merge remote-tracking branch 'origin/topic/seth/BIT-1786'
* origin/topic/seth/BIT-1786:
  Fixing tests
  Extend file extraction log.

BIT-1786 #merged
2017-01-26 13:49:35 -08:00
Robin Sommer
46368b718c Updating submodule. 2017-01-25 13:06:22 -08:00
Seth Hall
08bc5ccd42 Fixing tests 2017-01-25 02:06:35 -05:00
Seth Hall
2d1f007186 Extend file extraction log.
- New fields: extracted_cutoff and extracted_size.
   These fields will be null if the file isn't extracted.

 - Extended the extraction test to test the files log too.
2017-01-25 01:16:46 -05:00
Jon Siwek
fdb19872b4 Update submodule. 2017-01-24 19:40:33 -06:00
Robin Sommer
f5f517a97f Updating submodule. 2017-01-24 08:48:57 -08:00
Robin Sommer
9d2b69be42 Updating submodule. 2017-01-23 20:02:25 -08:00
Johanna Amann
07b7f1d193 Add new TLS extension type (cached_info) 2017-01-19 13:22:34 -08:00
Johanna Amann
e991189fff Remove brocon event.
It make the plugins/hooks test fail, because the number of the current
year shows up in the Baseline.
2017-01-19 13:01:35 -08:00
Johanna Amann
e3c7bcbb43 Add missing paths to SMM Log::create_streams calls 2017-01-12 13:45:39 +01:00
Johanna Amann
86271f2bdf Update submodule
[nomail]
2016-12-24 11:12:57 +01:00
Seth Hall
04d41dce5c Tiny xlsx file signature fix.
Thanks to Dan Caselden for noticing!
2016-12-08 08:32:45 -05:00
Johanna Amann
8eddeed78f Allow access to global variables using GLOBAL:: namespace.
Addresses BIT-1758. Patch was contributed by François Pennaneach
<francois.pennaneach@free.fr>.
2016-12-07 15:28:34 -08:00
Johanna Amann
ad345d7277 Merge remote-tracking branch 'origin/topic/dnthayer/ticket1516'
* origin/topic/dnthayer/ticket1516:
  Remove wordexp functionality from broxygen
  Fix a failing test on OpenBSD
  Fix compiler warnings on OpenBSD
  Fix a build failure on OpenBSD
  Fix test core.pcap.dumper to work on OpenBSD

BIT-1516 #merged
2016-12-07 14:53:35 -08:00
Daniel Thayer
85ddd3ca8b Remove wordexp functionality from broxygen
Broxygen no longer attempts to do tilde expansion of PATH
components when trying to get the mtime of Bro (this involved removing
the wordexp functionality, which doesn't exist on OpenBSD).  In the
very unlikely event that this causes problems for someone (this could
occur by running "bro -X configfile" if bro is located in a PATH
component which starts with a tilde, such as "~/bin"), the error
message text has been improved so that a user knows the workaround
for this (just run bro with a relative or absolute path).

Broxygen also no longer attempts to get the mtime of the bro executable
when bro wasn't invoked with the "-X" option.
2016-12-07 16:42:44 -06:00
Daniel Thayer
0581364d86 Fix a failing test on OpenBSD
Update a test due to the changes in commit e198fba2.
2016-12-06 10:46:29 -06:00
Johanna Amann
9059af6579 Update submodule
[nomail]
2016-12-05 16:17:54 -08:00
Johanna Amann
19d47ec6a9 Update submodule
[nomail]
2016-12-05 15:54:21 -08:00
Robin Sommer
99923583e4 Merge remote-tracking branch 'origin/topic/johanna/ocsp-validate-fix'
* origin/topic/johanna/ocsp-validate-fix:
  Fix validation of OCSP replies inside of Bro.

BIT-1763 #merged
2016-12-05 11:46:45 -08:00
Daniel Thayer
f107336f21 Fix compiler warnings on OpenBSD
Needed to add an "#include" to get the declaration of "struct in_addr".
2016-12-02 16:15:12 -06:00
Daniel Thayer
31e46d37f0 Fix a build failure on OpenBSD
The wordexp function doesn't exist in OpenBSD.  Skipping this
functionality only affects users who have bro installed in a directory
in the PATH and the directory name as it appears in PATH starts with
a tilde (e.g. "~/bin").  A simple workaround for affected users
would be to change the PATH environment variable to not contain any
tildes.
2016-12-02 14:31:16 -06:00
Daniel Thayer
de1c13e3a3 Fix test core.pcap.dumper to work on OpenBSD
The sdiff command on OpenBSD truncates the output at a different
position than sdiff on other platforms.  Simple fix is to use diff
instead of sdiff.
2016-12-01 16:35:54 -06:00
Johanna Amann
37a51b354e Fix validation of OCSP replies inside of Bro.
At one place in the code, we do not check the correct return code. This
makes it possible for a reply to get a response of "good", when the ocsp
reply is not actually signed by the responder in question.

This also instructs ocsp verication to skip certificate chain
validation, which we do ourselves earlier because the OCSP verify
function cannot do it correctly (no way to pass timestamp).
2016-11-30 13:17:09 -08:00
Johanna Amann
b39594408c Update submodules
[nomail]
2016-11-30 10:32:16 -08:00
Johanna Amann
9b9c3a6104 Merge remote-tracking branch 'origin/topic/dnthayer/ticket1757'
* origin/topic/dnthayer/ticket1757:
  Fix a build failure on OpenBSD

BIT-1757 #merged
2016-11-29 12:52:36 -08:00
Johanna Amann
beaf491fa3 Fix compile error in krb-types.pac.
Introduced in 15f2b30c73
2016-11-29 12:41:15 -08:00
Daniel Thayer
e198fba2d9 Fix a build failure on OpenBSD
The definition of a "struct pcap_pkthdr" on OpenBSD contains a member
of type "struct bpf_timeval" instead of "struct timeval" used on other
systems.

Also, on OpenBSD the header netinet/if_ether.h does not #include
net/if_arp.h as it does on other systems.
2016-11-29 14:20:43 -06:00
Vlad Grigorescu
15f2b30c73 Merge pull request #90 from jamesecorrenti/patch-1
Update krb-types.pac to allow for names that can have 3 components
2016-11-29 10:56:14 -06:00
Vlad Grigorescu
5845737c0c Fix a typo 2016-11-29 10:55:18 -06:00
jamesecorrenti
4b4ccabd70 Update krb-types.pac
KerberosString formatting for principal name to be compliant with RFC 4120 section 5.2.2, which states that there can be a few components (and in practice we have seen 3, more than the 1 or 2 that is typical)
2016-11-22 16:41:56 -05:00
Robin Sommer
7b44974a58 Updating submodule(s).
[nomail]
2016-11-16 14:52:13 -08:00
Robin Sommer
0bfd6424ab Updating submodule(s).
[nomail]
2016-11-15 13:26:03 -08:00
Robin Sommer
c1da7b4840 Updating submodule(s).
[nomail]
2016-11-15 13:24:18 -08:00
Robin Sommer
a984a30fd0 Updating submodule(s).
[nomail]
2016-11-15 13:23:34 -08:00
Robin Sommer
e9b0639ccb Adding missing '@load ./pubkey-hashes' to policy/frameworks/intel/seen. 2016-11-14 17:59:58 -08:00
Robin Sommer
a848b8785b Updating submodule(s).
[nomail]
2016-11-14 17:56:27 -08:00
Robin Sommer
6e1d55a3bb Merge remote-tracking branch 'origin/topic/dnthayer/doc-fixes-updates'
BIT-1748 #merged
2016-11-14 17:53:20 -08:00
Daniel Thayer
53d05fb24f Update a test baseline
The number of lines in scripts/base/frameworks/intel/main.bro changed
recently.
2016-11-14 14:59:19 -06:00
Daniel Thayer
2f40034c65 Correct one statement in NEWS 2016-11-14 14:54:13 -06:00
Daniel Thayer
15a825eb2d Fixed some warnings seen while running "make doc"
Moved the definitions of DCE_RPC::BackingState and DCE_RPC::State types
into the export block.  These types are used in the redef of the
"connection" record.
2016-11-14 14:46:53 -06:00
Daniel Thayer
475682ba7f Fix minor typos in documentation
Some of these fixes are for broken links in the auto-generated docs.
2016-11-14 09:50:19 -06:00
Daniel Thayer
67160338ba Update NEWS
Fixed minor typos and formatting, and added new info.
2016-11-11 16:03:28 -06:00
Daniel Thayer
6156590566 Remove unused "bindist" make target
The "pkg" subdirectory was removed in commit 19d66be0.
2016-11-11 15:41:25 -06:00
Daniel Thayer
5745213326 Fix minor typos in documentation of various scripts 2016-11-11 14:08:17 -06:00
Daniel Thayer
2347be3092 Improve the "How to Upgrade" page in the Bro docs
Added some text to clarify the procedure (it now reads more like
a step-by-step guide to upgrading).
2016-11-09 14:55:55 -06:00