]> git.ipfire.org Git - thirdparty/snort3.git/commit
Merge pull request #1006 in SNORT/snort3 from smb_unicode_fname to master
authorRuss Combs (rucombs) <rucombs@cisco.com>
Fri, 22 Sep 2017 13:41:28 +0000 (09:41 -0400)
committerRuss Combs (rucombs) <rucombs@cisco.com>
Fri, 22 Sep 2017 13:41:28 +0000 (09:41 -0400)
commit4ddaca746dd88c5ae3ee7fb6502222ff26a5b188
tree622152901824cf6bdd4779dbc997a6720fde5563
parenta851f7f454239561e57eb9b4104f511c2e7f07f8
Merge pull request #1006 in SNORT/snort3 from smb_unicode_fname to master

Squashed commit of the following:

commit aec151308a6b538db68baddeec1a09b956849993
Author: snorty <mdagon@cisco.com>
Date:   Wed Sep 20 17:40:48 2017 -0400

    Missed 2 files

commit 31c622a7fba16becbf5f6b24ce490e4a36cecb78
Author: snorty <mdagon@cisco.com>
Date:   Tue Sep 19 15:19:46 2017 -0400

    Additional changes from Michael's branch - cmake changes for iconv + additional improvements

commit 3758b4d8604c1b1fafce1138942b8f8f20c58ec3
Author: Michael Altizer <mialtize@cisco.com>
Date:   Fri Sep 15 14:47:57 2017 -0400

    build: Import iconv autotools logic from gnulib

commit ef23d1dabc7326091010988a6e0aa0cb936bcc5f
Author: mdagon <mdagon@cisco.com>
Date:   Mon Jul 24 10:29:15 2017 -0400

    SMB unicode filename support

    1. iconv is used for translating UTF16-LE file names to UTF8.
    2. Smb will add BOM to file name in case it is Unicode.
    3. Translation will be done in file_api during logging.
    4. Active response was updated to keep the same format of the original file name.
    5. File api was updated to use pipe-delimited hex for file names:
       printable text will show up as plain text and any 8-bit chars as hex
    6. Full file name, including path, will be logged, instead of only the file name
    7. NHI will send raw uri instead of normalized uri to file api
29 files changed:
build-aux/config.rpath [new file with mode: 0755]
cmake/FindICONV.cmake [new file with mode: 0644]
cmake/create_pkg_config.cmake
cmake/include_libraries.cmake
cmake/sanity_checks.cmake
config.cmake.h.in
configure.ac
doc/building.txt
doc/tutorial.txt
extra/configure.ac
m4/iconv.m4 [new file with mode: 0644]
m4/lib-ld.m4 [new file with mode: 0644]
m4/lib-link.m4 [new file with mode: 0644]
m4/lib-prefix.m4 [new file with mode: 0644]
src/CMakeLists.txt
src/file_api/file_api.h
src/file_api/file_lib.cc
src/file_api/file_lib.h
src/file_api/file_log.cc
src/service_inspectors/dce_rpc/dce_smb.h
src/service_inspectors/dce_rpc/dce_smb2.cc
src/service_inspectors/dce_rpc/dce_smb_commands.cc
src/service_inspectors/dce_rpc/dce_smb_transaction.cc
src/service_inspectors/dce_rpc/dce_smb_utils.cc
src/service_inspectors/dce_rpc/dce_smb_utils.h
src/service_inspectors/http_inspect/http_msg_body.cc
src/utils/util.cc
src/utils/util_utf.cc
src/utils/util_utf.h