Skip to content

Commit cd68b06

Browse files
keithjjoneskeithjjones
authored
Merge pull request #1 from rdylanwalker/bugfix/update_zkg_meta
Bugfix: Remove --zeek-dist argument from zkg.meta
2 parents ad35a21 + 572dc36 commit cd68b06

File tree

7 files changed

+13
-17
lines changed

7 files changed

+13
-17
lines changed

‎README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ You can download the example [PCAP file http_with_jpegs.cap](https://wiki.wiresh
6767
Here is what the output will look like:
6868

6969
```
70-
% zeek -B file_analysis -r pcaps/http_with_jpegs.cap jpeg.zeek
70+
% zeek -r pcaps/http_with_jpegs.cap jpeg.zeek
7171
[marker_val=224, len=16, data=JFIF\x00\x01\x01\x01\x00H\x00H\x00\x00, marker_num=0]
7272
[marker_val=254, len=23, data=Created with The GIMP, marker_num=1]
7373
[marker_val=219, len=67, data=\x00\x14\x0e\x0f\x12\x0f\x0d\x14\x12\x10\x12\x17\x15\x14\x18\x1e2!\x1e\x1c\x1c\x1e=,.$2I@LKG@FEPZsbPUmVEFd\x88emw{\x81\x82\x81N`\x8d\x97\x8c}\x96s~\x81|, marker_num=2]

‎VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
0.1.0
1+
0.1.3

‎src/jpeg-analyzer.pac

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
%extern{
22
#include "Event.h"
3-
#include "DebugLogger.h"
43
#include "file_analysis/File.h"
54
#include "events.bif.h"
65
#include "types.bif.h"
@@ -18,13 +17,9 @@ refine flow File += {
1817
function proc_jpeg_header(h: JPEG_Header): bool
1918
%{
2019

21-
DBG_LOG(DBG_FILE_ANALYSIS, "TRYING TO PROCESS A JPEG!!!");
22-
2320
if ( file_jpeg_marker )
2421
{
2522

26-
DBG_LOG(DBG_FILE_ANALYSIS, "PROCESSING A JPEG!!!");
27-
2823
int markers[] = { 0, 1, 2, 3, 4 };
2924
for (int m: markers)
3025
{
@@ -41,8 +36,6 @@ refine flow File += {
4136
}
4237
}
4338

44-
DBG_LOG(DBG_FILE_ANALYSIS, "DONE PROCESSING A JPEG!!!");
45-
4639
return true;
4740
%}
4841
};

‎tests/Baseline/jpeg.jpeg/jpeg.log

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,15 @@
1+
### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
12
#separator \x09
23
#set_separator ,
34
#empty_field (empty)
45
#unset_field -
56
#path jpeg
6-
#open 2019-12-16-14-05-18
7+
#open XXXX-XX-XX-XX-XX-XX
78
#fields ts id total_bytes width height jfif_major jfif_minor comment
89
#types time string count count count count count string
9-
1100903355.573238 FxUtSi4RIZf03k0sFd 8281 512 512 1 1 Created with The GIMP
10-
1100903355.580655 FKuUQ14DO6SOTBbaB5 9045 500 89 1 1 Created with The GIMP
11-
1100903360.932707 FC536m3fh036oWUd3i 8963 180 240 1 1 Created with The GIMP
12-
1100903360.939152 Fqu89k3QfZCvvvZN0g 10730 180 240 1 1 Created with The GIMP
13-
1100903365.003584 FqMaUw18GBKJ7r5oca 191515 960 1280 1 1 Created with The GIMP
14-
#close 2019-12-16-14-05-18
10+
XXXXXXXXXX.XXXXXX F9xrhhmDhEXkxEFX9 8281 512 512 1 1 Created with The GIMP
11+
XXXXXXXXXX.XXXXXX FjRlb33EIdThziJPJl 9045 500 89 1 1 Created with The GIMP
12+
XXXXXXXXXX.XXXXXX FyL3WZ3qMRgaaEfxvd 8963 180 240 1 1 Created with The GIMP
13+
XXXXXXXXXX.XXXXXX F0pX3P2fuPnPkFCjWh 10730 180 240 1 1 Created with The GIMP
14+
XXXXXXXXXX.XXXXXX FJZdTz3z1GpscFNJt4 191515 960 1280 1 1 Created with The GIMP
15+
#close XXXX-XX-XX-XX-XX-XX

‎tests/Baseline/jpeg.jpeg/jpeg.out

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
12
[marker_val=224, len=16, data=JFIF\x00\x01\x01\x01\x00H\x00H\x00\x00, marker_num=0]
23
[marker_val=254, len=23, data=Created with The GIMP, marker_num=1]
34
[marker_val=219, len=67, data=\x00\x14\x0e\x0f\x12\x0f\x0d\x14\x12\x10\x12\x17\x15\x14\x18\x1e2!\x1e\x1c\x1c\x1e=,.$2I@LKG@FEPZsbPUmVEFd\x88emw{\x81\x82\x81N`\x8d\x97\x8c}\x96s~\x81|, marker_num=2]

‎tests/Baseline/jpeg.show-plugin/output

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
12
Zeek::JPEG - A Zeek JPEG File Analyzer (dynamic, version)
23
[File Analyzer] JPEG (ANALYZER_JPEG)
34
[Type] Zeek::JPEGMarker

‎zkg.meta

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@
22
description = This package provides some basic analysis for JPEG files.
33
tags = intel, files, jpeg, jpg
44
script_dir = scripts/Zeek/JPEG
5-
build_command = ./configure --enable-debug --zeek-dist=%(zeek_dist)s && make
5+
build_command = ./configure --enable-debug && make
66
test_command = cd tests && btest

0 commit comments

Comments
 (0)