Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-09 01:58:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge remote-tracking branch 'origin/sethhall-fix-ssl-files-warning'

Browse source 
* origin/sethhall-fix-ssl-files-warning:
  Fix warning when reading files from non-network sources
This commit is contained in:
Jon Siwek 2020-01-14 09:45:45 -08:00
commit f59e3da4f7
3 changed files with 9 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

7
CHANGES
View file

@ -1,4 +1,11 @@
3.1.0-dev.376 | 2020-01-14 09:45:45 -0800
* Fix warning when reading files from non-network sources (Seth Hall, Corelight)
If files are being read from non-network sources, there was a warning in
the SSL base scripts about missing the f$conns field.
3.1.0-dev.372 | 2020-01-13 12:10:42 +0000
* Fix method returning a reference to a temporary. Found by

2
VERSION
View file

@ -1 +1 @@
3.1.0-dev.372
3.1.0-dev.376

2
scripts/base/protocols/ssl/files.zeek
View file

@ -92,7 +92,7 @@ event zeek_init() &priority=5
event file_sniff(f: fa_file, meta: fa_metadata) &priority=5
{
if ( |f$conns| != 1 )
if ( ! f?$conns || |f$conns| != 1 )
return;
if ( ! f?$info || ! f$info?$mime_type )