]> git.ipfire.org Git - thirdparty/snort3.git/commit
Merge pull request #127 in SNORT/snort3 from crc/obfu to master
authorRuss Combs (rucombs) <rucombs@cisco.com>
Tue, 10 Nov 2015 17:08:22 +0000 (12:08 -0500)
committerRuss Combs (rucombs) <rucombs@cisco.com>
Tue, 10 Nov 2015 17:08:22 +0000 (12:08 -0500)
commit49eb0335de167a4c642b687bd7ef03c1c00ebf98
treeeaaf57273e352b548bc37f25b99b834158b7fc01
parentc96a052fd43dda6dc3094baf584059a7135b073a
Merge pull request #127 in SNORT/snort3 from crc/obfu to master

Squashed commit of the following:

commit fe3281566d1987bfd9cdbacc97e614ece01c0399
Author: Russ Combs <rucombs@cisco.com>
Date:   Tue Nov 10 07:55:56 2015 -0500

    rehome OHI only foo

commit d4baae181bbb9067d27be9ee72928e35eae67dc7
Author: Russ Combs <rucombs@cisco.com>
Date:   Tue Nov 10 07:33:09 2015 -0500

    do not build obfuscation until needed
src/detection/detect.cc
src/detection/detection_util.h
src/log/CMakeLists.txt
src/log/Makefile.am
src/log/log_text.cc
src/log/obfuscation.h
src/loggers/unified2.cc
src/service_inspectors/http_inspect/hi_main.h