Commit graph

817 commits

Author SHA1 Message Date
Johanna Amann
5baeb4790d Updating submodule
[nomail]
2016-05-11 11:25:39 -07:00
Robin Sommer
90223fe428 Updating submodule(s).
[nomail]
2016-05-09 09:45:21 -07:00
Robin Sommer
b23ed77819 Updating submodule(s).
[nomail]
2016-05-07 12:24:20 -07:00
Robin Sommer
abebd036bc Merge remote-tracking branch 'origin/topic/johanna/xmpp-starttls'
* origin/topic/johanna/xmpp-starttls:
  XMPP: Add StartTLS event and update tests
  Add xmpp dpd sig and fix a few parsing problems for connections that do not upgrade to TLS.
  Add simple XMPP StartTLS analyzer.

BIT-1579 #merged
2016-05-06 16:56:06 -07:00
Robin Sommer
8a6ca053bf Updating submodule(s).
[nomail]
2016-05-03 11:17:01 -07:00
Robin Sommer
cc54b3772a Updating submodule(s).
[nomail]
2016-04-28 20:13:44 -07:00
Robin Sommer
380963b506 Updating submodule(s).
[nomail]
2016-04-28 10:06:01 -07:00
Robin Sommer
b5f1fb33fa Updating submodule(s).
[nomail]
2016-04-07 13:40:31 -07:00
Robin Sommer
0588f3510b Updating submodule(s).
[nomail]
2016-03-21 11:59:41 -07:00
Robin Sommer
f5ce4785ea Updating submodule(s).
[nomail]
2016-03-11 15:26:16 -08:00
Robin Sommer
15c157d8ff Updating submodule(s).
[nomail]
2016-03-10 13:25:33 -08:00
Robin Sommer
3d1b5814fd Updating submodule(s).
[nomail]
2016-03-10 12:06:48 -08:00
Robin Sommer
dde52abb1a Updating submodule(s).
[nomail]
2016-03-10 12:03:34 -08:00
Robin Sommer
8cf5cbdbcf Updating submodule(s).
[nomail]
2016-03-04 20:35:06 -08:00
Robin Sommer
154a5f1f7f Updating submodule(s).
[nomail]
2016-03-04 12:40:14 -08:00
Robin Sommer
4a88a85833 Updating submodule(s). 2016-03-04 08:25:40 -08:00
Robin Sommer
611a8ab935 Updating submodule(s).
[nomail]
2016-02-23 14:02:43 -08:00
Robin Sommer
0ac6460e98 Updating submodule(s).
[nomail]
2016-02-15 11:07:49 -08:00
Robin Sommer
9a7a024f6e Merge remote-tracking branch 'origin/fastpath'
* origin/fastpath:
  Add missing break; in StartTLS case of IRC analyzer.
2016-02-13 10:48:45 -08:00
Johanna Amann
ba8742ebb4 Update submodule
[nomail]
2016-02-08 17:54:33 -08:00
Johanna Amann
043ebba937 Update submodule
[nomail]
2016-02-08 12:36:22 -08:00
Robin Sommer
9ec6927cc1 Updating submodule(s).
[nomail]
2016-02-01 12:38:39 -08:00
Robin Sommer
72f0c2bd65 Merge remote-tracking branch 'origin/topic/johanna/cve-2015-3194'
* origin/topic/johanna/cve-2015-3194:
  Add testcase for CVE-2015-3194

BIT-1527 #merged
2016-02-01 12:36:54 -08:00
Robin Sommer
e63990398d Updating submodule(s).
[nomail]
2016-01-29 10:49:08 -08:00
Robin Sommer
cb41161d9f Merge branch 'master' of git.bro.org:bro
(Fixing a merge conflict in CHANGES).
2016-01-28 08:07:38 -08:00
Robin Sommer
43ffc95b0d Updating submodule(s).
[nomail]
2016-01-25 15:59:46 -08:00
Robin Sommer
f78bbc8e6f Updating submodule(s).
[nomail]
2016-01-25 14:23:53 -08:00
Johanna Amann
600d6480b4 Update submodule
[nomail]
2016-01-21 10:25:03 -08:00
Robin Sommer
176b0e7b44 Merge remote-tracking branch 'origin/topic/seth/compiler-cleanup'
BIT-1524 #merged

* origin/topic/seth/compiler-cleanup:
  Updating binpac submodule.
  Fixed a format specifier.
  Adding override/final to overridden virtual methods.
2016-01-19 10:22:31 -08:00
Seth Hall
154bc47e2e Updating binpac submodule. 2016-01-17 00:42:16 -05:00
Johanna Amann
8d8a883e78 Updating submodule.
[nomail]
2016-01-15 19:23:28 -08:00
Robin Sommer
9423c325a6 Updating submodule(s).
[nomail]
2016-01-15 15:08:20 -08:00
Robin Sommer
a72626f01a Updating submodule(s).
[nomail]
2016-01-15 15:06:17 -08:00
Robin Sommer
374e61ee20 Updating submodule(s).
[nomail]
2015-12-19 13:40:28 -08:00
Robin Sommer
4218ab2dba Updating submodule. 2015-12-18 17:47:47 -08:00
Robin Sommer
5cb4cd3970 Merge branch 'patch-1' of https://github.com/aeppert/bro 2015-12-18 11:43:38 -08:00
Robin Sommer
f0a28788ad Updating submodule(s).
[nomail]
2015-12-04 16:50:53 -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
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
88a4683d22 Updating NEWS for new plugins. 2015-10-26 13:43:56 -07:00
Robin Sommer
8e1ce36434 Updating submodule(s).
[nomail]
2015-10-01 17:23:04 -07:00
Robin Sommer
7a43502607 Updating submodule(s).
[nomail]
2015-10-01 17:13:34 -07:00
Robin Sommer
24973e56bd Updating submodule(s).
[nomail]
2015-10-01 17:13:27 -07:00
Robin Sommer
e66b236ae8 Tiny tweak for code consistency in RAW reader. 2015-10-01 16:31:25 -07:00