Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-06 16:48:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
6849 commits 387 branches 195 tags 259 MiB
Commit graph

6849 commits

This branch
This branch
All branches
Author SHA1 Message Date
Robin Sommer
eae21d4d33 Merge branch 'master' of git.bro.org:bro 2015-12-18 11:22:39 -08:00
Robin Sommer
0ba6bec710 Merge remote-tracking branch 'origin/topic/johanna/irc-starttls' 
* origin/topic/johanna/irc-starttls:
  StartTLS support for IRC

BIT-1513 #merged
 2015-12-18 11:20:59 -08:00
Jan Grashoefer
6f891ca2ff Added test-case for intel framework matching email 
Addresses #1507
 2015-12-16 14:51:02 +01:00
Johanna Amann
25a8d87da9 Change one forgotten bro-ids.org to bro.org 2015-12-14 15:58:16 -08:00
Robin Sommer
f0a28788ad Updating submodule(s). 
[nomail]
 2015-12-04 16:50:53 -08:00
Robin Sommer
bb51f40d93 Merge branch 'master' of git.bro.org:bro 2015-12-04 16:49:44 -08:00
Robin Sommer
952c64a793 Delaying BinPAC initializaton until afte plugins have been activated. 2015-12-04 16:40:43 -08:00
Robin Sommer
6dd32c649b Merge branch 'topic/robin/bpf-vector' 
* topic/robin/bpf-vector:
  Use better data structure for storing BPF filters.
 2015-12-04 15:25:56 -08:00
Aaron Eppert
5d1ed9c134 Update windows-version-detection.bro 
mscrl.microsoft.com is the proper hostname, however to be safe, let's use regex to identify it.
 2015-12-04 09:46:14 -05:00
Johanna Amann
cf97d1e991 Update installation instructions to add os-x openssl dependency. 
Also remove blob about binary mac packages, which we no longer provide.
 2015-12-01 13:13:48 -08:00
Seth Hall
4e4dece70a SIP scripts code cleanup. 
- Daniel Guerra pointed out a type issue for SIP
   request and response code length fields which is now
   corrected.
 - Some redundant code was removed.
 - if/else tree modified to use switch instead.
 2015-11-29 00:24:53 -05:00
Robin Sommer
c22a6f67d2 Use better data structure for storing BPF filters. 2015-11-23 19:55:02 -08:00
Robin Sommer
17bc615467 Making cluster reconnect timeout configurable. 2015-11-17 13:43:58 -08:00
Robin Sommer
931837c5a2 Bugfix for communication child loop. 
It could end up blocking indefinitly in cases where it shouldn't.
 2015-11-17 13:27:49 -08:00
Robin Sommer
eb6e8c75b9 Updating submodule(s). 
[nomail]
 2015-11-16 07:31:42 -08:00
Jon Siwek
21c6b52c28 Updating submodule(s). 
[nomail]
 2015-11-11 09:24:16 -06:00
Robin Sommer
39a5325ea0 Updating submodule(s). 
[nomail]
 2015-11-10 13:34:53 -08:00
Robin Sommer
037285555f Updating submodule(s). 
[nomail]
 2015-11-10 13:33:33 -08:00
Robin Sommer
1da6f4a430 Fix to compile with OpenSSL that has SSLv3 disalbed. 
Patch by Christoph Pietsch.
 2015-11-10 13:31:02 -08:00
Robin Sommer
96791d707f Merge remote-tracking branch 'origin/topic/dnthayer/ticket1503' 
* origin/topic/dnthayer/ticket1503:
  Fix potential race condition when logging VLAN info to conn.log

BIT-1503 #merged
 2015-11-10 13:20:49 -08:00
Daniel Thayer
28f4d45d33 Fix potential race condition when logging VLAN info to conn.log 
Lowered priority of a connection_state_remove event handler to ensure
that the "conn" field is initialized in the connection record before
attempting to add the VLAN tags.
 2015-11-05 12:14:05 -06:00
Robin Sommer
1119ca8792 Updating submodule(s). 
[nomail]
 2015-10-28 07:09:03 -07:00
Robin Sommer
329594e8a2 Updating NEWS. 2015-10-27 16:11:43 -07:00
Robin Sommer
cae66721e6 Adding missing file. 2015-10-26 16:58:44 -07:00
Robin Sommer
9d7ec6b6d2 Merge branch 'master' of https://github.com/aeppert/bro 
Cleaned up the surrounding code a bit and also added '[' as another
case (not sure that can happen, but doesn't hurt eihter).

* 'master' of https://github.com/aeppert/bro:
  Whitespace
  Remove
  Remove.
  Fix for JSON formatter
  A fatal error, especially in DEBUG, should result in a core.
  Seems to fix a case where an entry in the table may be null on insert.
 2015-10-26 16:52:47 -07:00
Aaron Eppert
3b027fdebb Whitespace 2015-10-26 18:10:26 -04:00
Aaron Eppert
053aa40335 Remove 2015-10-26 18:09:38 -04:00
Aaron Eppert
1b09734b31 Remove. 2015-10-26 18:06:41 -04:00
Aaron Eppert
295dbc3055 Fix for JSON formatter 
In the event that the first entry in a record is optional AND not present, the serializer will incorrectly add a leading comma. This leading common is invalid JSON and will, more often than not, cause parser failures downstream.
 2015-10-26 17:55:01 -04:00
Aaron Eppert
81d141959f Merge branch 'bro-master' 2015-10-26 17:48:21 -04:00
Robin Sommer
a83d97937e Extending rexmit_inconsistency() event to receive an additional 
parameter with the packet's TCP flags, if available.
 2015-10-26 14:16:08 -07:00
Robin Sommer
88a4683d22 Updating NEWS for new plugins. 2015-10-26 13:43:56 -07:00
Robin Sommer
41ebce097d Merge remote-tracking branch 'origin/topic/johanna/tls_early_alert' 
* origin/topic/johanna/tls_early_alert:
  Add missing pcap file for tls dpd test.
 2015-10-23 15:23:19 -07:00
Robin Sommer
a6b884e764 Removing pcap options for AF_PACKET support. 
Turns out that's not working. Addresses BIT-1363.
 2015-10-23 15:06:02 -07:00
Johanna Amann
c7f0945f54 Add missing pcap file for tls dpd test. 2015-10-23 15:04:26 -07:00
Robin Sommer
cf4fcf5751 Merge remote-tracking branch 'origin/fastpath' 
* origin/fastpath:
  Correct a typo in controller.bro documentation
 2015-10-23 14:05:29 -07:00
Robin Sommer
a1c0d9d91c Merge remote-tracking branch 'origin/topic/johanna/tls_early_alert' 
* origin/topic/johanna/tls_early_alert:
  Extend ssl dpd signature to allow alert before server_hello.

BIT-1496 #merged
 2015-10-23 14:04:43 -07:00
Robin Sommer
ecc09c11ca Merge remote-tracking branch 'origin/topic/johanna/string_vec_null' 
* origin/topic/johanna/string_vec_null:
  Make join_string_vec work with vectors containing empty elements.

BIT-1495 #merged
 2015-10-23 13:12:42 -07:00
Robin Sommer
c151a25843 Fix support for HTTP connect when server adds headers to response. 
Patch by Eric Karasuda.

I slightly tweaked the patch to not need a new member variable. Also
turned the provided trace into a test case.
 2015-10-23 13:10:33 -07:00
Johanna Amann
401e6c9102 Extend ssl dpd signature to allow alert before server_hello. 
The alert in this case is caused by the server name in the SNI not being
recognized by the server, which triggers an alert. Since the server is
an apache, and this might happen reasonably often, the new signature
allows one TLS alert before the server hello is expected.
 2015-10-22 13:36:21 -07:00
Johanna Amann
551a7d7394 Make join_string_vec work with vectors containing empty elements. 
Without this patch, this scenario results in a segmentation fault.

I opted to keep the separator present for non-existing elements. Hence,
a vector a, [empty], b with separator "|" will result in
a||b
 2015-10-22 13:08:47 -07:00
Daniel Thayer
5ba8610681 Correct a typo in controller.bro documentation 2015-10-21 12:48:35 -05:00
Seth Hall
1d94eadd36 Fixed RadioTap support (still "Works for Me") 2015-10-17 03:09:12 -04:00
Seth Hall
d6c89ae022 Merge branch 'master' into topic/seth/radiotap 
# Conflicts:
#	src/iosource/PktSrc.cc
 2015-10-16 16:59:23 -04:00
Robin Sommer
5734ead510 Merge remote-tracking branch 'origin/topic/dnthayer/ticket1467' 
* origin/topic/dnthayer/ticket1467:
  Load static CA list for validation tests too.
  Remove cluster certificate validation script for the moment.
  Fix a bug in diff-remove-x509-names canonifier
  Fix some test canonifiers in scripts/policy/protocols/ssl

BIT-1467 #merged
 2015-10-05 09:14:57 -07:00
Johanna Amann
77c79bd010 Load static CA list for validation tests too. 
This fixes test failures in some cases (and should protect against future test failures).
 2015-10-02 15:12:32 -04:00
Johanna Amann
0e0dd9a5f7 Remove cluster certificate validation script for the moment. 
Since we always have wallclock time in --pseudo-realtime, there
currently is no way to make this test reliable.
 2015-10-02 11:32:15 -07:00
Johanna Amann
630e9f22d2 Merge remote-tracking branch 'origin/master' into topic/dnthayer/ticket1467 2015-10-02 11:31:00 -07:00
Robin Sommer
8e1ce36434 Updating submodule(s). 
[nomail]
 2015-10-01 17:23:04 -07:00
Robin Sommer
be70a1b953 Merge branch 'master' of git.bro.org:bro 2015-10-01 17:20:14 -07:00