Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

next/607/20241021/v1 #12004

Merged
merged 10 commits into from
Oct 22, 2024
Merged

next/607/20241021/v1 #12004

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
b5fcf16
enip/detect: remove double registration of enip_command keyword
catenacyber Oct 17, 2024
799822c
profiling: Correct profiling data array size
jlucovsky Oct 16, 2024
3ddd9e2
eve/tls: disable clang formatting around tls_fields array
jasonish Oct 17, 2024
6a185a8
eve/tls: add alpn logging to custom output
jasonish Oct 17, 2024
2e78840
eve/tls: remove broken check for ja3 being enabled
jasonish Oct 17, 2024
377989d
eve/tls: reimplement basic and extended logging in terms of custom
jasonish Oct 17, 2024
714ada1
eve/tls: cleanup headers; update copyright year
jasonish Oct 17, 2024
cc519be
suricata.yaml: add missing custom tls fields
jasonish Oct 18, 2024
2462d9d
eve/tls: remove unused SC_ATOMIC_EXTERN
jasonish Oct 18, 2024
30806ce
eve/tls: use BIT_U64 for flags
jasonish Oct 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion doc/userguide/partials/eve-log.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,8 @@ outputs:
# session id
#session-resumption: no
# custom controls which TLS fields that are included in eve-log
#custom: [subject, issuer, session_resumed, serial, fingerprint, sni, version, not_before, not_after, certificate, chain, ja3, ja3s, ja4]
# WARNING: enabling custom disables extended logging.
#custom: [subject, issuer, session_resumed, serial, fingerprint, sni, version, not_before, not_after, certificate, chain, ja3, ja3s, ja4, subjectaltname, client, client_certificate, client_chain, client_alpns, server_alpns]
- files:
force-magic: no # force logging magic on all logged files
# force logging of checksums, available hash functions are md5,
Expand Down
16 changes: 0 additions & 16 deletions rust/src/enip/detect.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1558,22 +1558,6 @@ pub unsafe extern "C" fn ScDetectEnipRegister() {
true,
true,
);
let kw = SCSigTableElmt {
name: b"enip_command\0".as_ptr() as *const libc::c_char,
desc: b"rules for detecting EtherNet/IP command\0".as_ptr() as *const libc::c_char,
url: b"/rules/enip-keyword.html#enip_command\0".as_ptr() as *const libc::c_char,
AppLayerTxMatch: Some(command_match),
Setup: command_setup,
Free: Some(command_free),
flags: 0,
};
G_ENIP_COMMAND_KW_ID = DetectHelperKeywordRegister(&kw);
G_ENIP_COMMAND_BUFFER_ID = DetectHelperBufferRegister(
b"enip.command\0".as_ptr() as *const libc::c_char,
ALPROTO_ENIP,
true,
true,
);
let kw = SCSigTableElmt {
name: b"enip.cip_status\0".as_ptr() as *const libc::c_char,
desc: b"rules for detecting EtherNet/IP cip_status\0".as_ptr() as *const libc::c_char,
Expand Down
Loading
Loading