]> git.ipfire.org Git - thirdparty/snort3.git/commit
Merge pull request #2658 in SNORT/snort3 from ~MIALTIZE/snort3:catch_update to master
authorMichael Altizer (mialtize) <mialtize@cisco.com>
Wed, 9 Dec 2020 04:59:34 +0000 (04:59 +0000)
committerMichael Altizer (mialtize) <mialtize@cisco.com>
Wed, 9 Dec 2020 04:59:34 +0000 (04:59 +0000)
commitd395c15b19dbdf1fc8d67966ebc5c49dc6af7f4f
tree0bdd070efc8b0778648b3fc6b065ff520fa2d1e3
parent45a4f4843c50e294f250777f77e136983f4e6749
Merge pull request #2658 in SNORT/snort3 from ~MIALTIZE/snort3:catch_update to master

Squashed commit of the following:

commit 8ade74b146db3de41d78a540a1f083793fd02322
Author: Michael Altizer <mialtize@cisco.com>
Date:   Tue Dec 8 18:09:05 2020 -0500

    build: Clean up various cppcheck warnings

commit 515fdcc0e0d733396c13a256d46fde3087540b55
Author: Michael Altizer <mialtize@cisco.com>
Date:   Tue Sep 8 11:07:35 2020 -0400

    catch: Avoid using INTERNAL_CATCH_UNIQUE_NAME in our headers

commit 2084175f47ec1007db9952518670d93d9382e8fe
Author: Michael Altizer <mialtize@cisco.com>
Date:   Tue Dec 8 17:48:18 2020 -0500

    catch: Update to Catch v2.13.3
14 files changed:
src/catch/catch.hpp
src/catch/snort_catch.h
src/ips_options/asn1_util.cc
src/ips_options/ips_sd_pattern.cc
src/network_inspectors/appid/appid_session.cc
src/network_inspectors/appid/appid_session.h
src/network_inspectors/appid/ips_appid_option.cc
src/parser/parse_ports.cc
src/service_inspectors/dce_rpc/dce_db.h
src/service_inspectors/ftp_telnet/pp_ftp.cc
src/stream/tcp/tcp_reassembler.cc
src/stream/tcp/tcp_reassembler.h
tools/snort2lua/data/dt_data.cc
tools/u2spewfoo/u2spewfoo.cc