[Oisf-devel] [COMMIT] OISF branch, master, updated. suricata-2.1beta4-382-gdc2c896

[OISF Git]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "OISF".

The branch, master has been updated
       via  dc2c8967819fc1e60cbc992c85893e166617f8fc (commit)
       via  9697a09d219ca8abe9bb948df9120338646f23ca (commit)
       via  38c21077e63e0212ed0e95936a9843fbcdeb7a70 (commit)
       via  3676bd667d494ac93c29e1092715435c052eef31 (commit)
       via  484885b70fe0ee380489f63545c49bd898afbc6d (commit)
       via  af6d1dddfa0da9b0f6db8655e3c3dc0b66f01d31 (commit)
       via  70cc1ddbcd60fdb9373350e34aa276a98a9727e1 (commit)
       via  7eab16c47809f79464ea15d9c349648fc25c5b44 (commit)
      from  dcbbda505f1abb55739333de0c6c347e30cb5797 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit dc2c8967819fc1e60cbc992c85893e166617f8fc
Author: Jason Ish <ish at unx.ca>
Date:   Thu Oct 8 15:20:25 2015 -0600

    app-layer setup scripts: enable new modules on copy
    
    The templates are disabled by default, enable the copy
    of the template so the new app-layer modules are enabled by
    by default.

commit 9697a09d219ca8abe9bb948df9120338646f23ca
Author: Jason Ish <ish at unx.ca>
Date:   Thu Oct 8 14:54:57 2015 -0600

    template app-layer: disable if not in config file (default)
    
    Unlike other app-layer protocols which are enabled by default,
    disable this one by default as it likely shouldn't be enabled
    in production use of Suricata.

commit 38c21077e63e0212ed0e95936a9843fbcdeb7a70
Author: Eric Leblond <eric at regit.org>
Date:   Wed Oct 14 14:17:19 2015 +0200

    json-email-common: fix email extended logging
    
    Two structure fields were uninitialized and used has a bit field.
    Weird behavior were seen in list of logged fields due to that with
    some build options.

commit 3676bd667d494ac93c29e1092715435c052eef31
Author: Eric Leblond <eric at regit.org>
Date:   Wed Oct 14 13:48:29 2015 +0200

    json-email-common: suppress commented code

commit 484885b70fe0ee380489f63545c49bd898afbc6d
Author: Eric Leblond <eric at regit.org>
Date:   Wed Oct 14 12:13:06 2015 +0200

    json-email-common: can now log same header twice
    
    Multiple events can be applied on a transaction so we may need to
    log the same header twice.
    
    The HDR_IS_LOGGED flag was making it impossible. And this system
    is usless as email application layer is transaction based.

commit af6d1dddfa0da9b0f6db8655e3c3dc0b66f01d31
Author: Torgeir Natvig <torgeir.natvig at gmail.com>
Date:   Sat Oct 17 00:44:49 2015 +0200

    Bugfix for detect-engine.luajit-states
    
    detect-engine is a list, and luajit-states was looked up as a map.

commit 70cc1ddbcd60fdb9373350e34aa276a98a9727e1
Author: Mats Klepsland <mats.klepsland at gmail.com>
Date:   Fri Oct 2 09:23:13 2015 +0200

    lua: SSH output support
    
    Support SSH in lua output scripts (Feature #1569).

commit 7eab16c47809f79464ea15d9c349648fc25c5b44
Author: Mats Klepsland <mats.klepsland at gmail.com>
Date:   Fri Oct 2 09:00:51 2015 +0200

    lua: SSH support
    
    Support SSH in lua detection scripts (Feature #1569).

-----------------------------------------------------------------------

Summary of changes:
 scripts/setup-app-layer-detect.sh      |   6 +-
 scripts/setup-app-layer-logger.sh      |   6 +-
 scripts/setup-app-layer.sh             |   6 +-
 src/Makefile.am                        |   1 +
 src/app-layer-ssh.h                    |   2 +
 src/app-layer-template.c               |  14 +-
 src/detect-lua-extensions.c            |   2 +
 src/detect-lua.c                       |  26 +++-
 src/detect-template-buffer.c           |   5 +
 src/output-json-email-common.c         | 148 ++++++++++-----------
 src/output-json-template.c             |   4 +
 src/output-lua.c                       |  88 +++++++++++++
 src/util-decode-mime.h                 |   3 -
 src/util-lua-ssh.c                     | 227 +++++++++++++++++++++++++++++++++
 src/{util-lua-tls.h => util-lua-ssh.h} |  10 +-
 15 files changed, 448 insertions(+), 100 deletions(-)
 create mode 100644 src/util-lua-ssh.c
 copy src/{util-lua-tls.h => util-lua-ssh.h} (80%)


hooks/post-receive
-- 
OISF