Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-07 17:18:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge branch 'topic/keithjjones/openvpn' of https://github.com/keithjjones/zeek

Browse source 
* 'topic/keithjjones/openvpn' of https://github.com/keithjjones/zeek:
  Replace assert with if statement so OpenVPN can use this over UDP.  And fix spelling.
This commit is contained in:
Johanna Amann 2021-03-08 11:20:42 +00:00
commit 358d82eb38
4 changed files with 11 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/analyzer/protocol/ssl/SSL.cc
View file

@ -57,8 +57,10 @@ void SSL_Analyzer::DeliverStream(int len, const u_char* data, bool orig)
{
analyzer::tcp::TCP_ApplicationAnalyzer::DeliverStream(len, data, orig);
assert(TCP());
if ( TCP()->IsPartial() )
// We purposefully accept protocols other than TCP here. SSL/TLS are a bit special;
// they are wrapped in a lot of other protocols. Some of them are UDP based - and provide
// their own reassembly on top of UDP.
if ( TCP() && TCP()->IsPartial() )
return;
if ( had_gap )