[Oisf-devel] [COMMIT] OISF branch, master, updated. suricata-3.0.1-249-gd84dc02

Wed May 18 07:54:02 UTC 2016

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  d84dc02bd706694a97f99775239e5af67e6c6104 (commit)
       via  fbf0a7aa45254405e2432a73cfa9935b5d181fba (commit)
       via  80716f860e72758cd032dec91376d056fb80743f (commit)
       via  90414472eda57134ca58cb9f338df2d169520896 (commit)
       via  667e4e68bf01e0cc19d0cac501ae6d4df80095e9 (commit)
       via  45342078e4032deb0916b0f7fb11f1471bf05ee7 (commit)
       via  ed33f5f14859b6bbe2b290ee5351e9a445e1a9aa (commit)
       via  77cc03505b3e59c73e359c71ffa9f696bb3eb8d9 (commit)
       via  663273a31e0903ad6f58849d4e1b4ac0052277a5 (commit)
       via  47a4daeeb88729af0efd56ce574ab81297c11117 (commit)
       via  e9074bc829d1ef9932b5fdf420bd610775d8fb91 (commit)
       via  c6a61e009b65b19dbe745d23022fad518a24c369 (commit)
       via  88bf866381f295cfde3805eab0a4cb1b0630f853 (commit)
       via  fa6257b66ab4415ad51a0ca09a24cb6c65bd36ef (commit)
       via  4166ec306414230d1b69fb28710824ba27c3af0d (commit)
       via  593f81527ac902f320136a6080a85a21648d55a6 (commit)
       via  c52fe9a5fa1761f3d8f334fbd13315f3ce921c70 (commit)
       via  d484812d05669b10e82a5f782666d7e57fe43955 (commit)
       via  dacb860d24f221fd7ad5a3fc775ad35f556717e0 (commit)
       via  1f98915ebe072e7af1c7c93a223d901f91f71c09 (commit)
       via  f3599323e4ff649fa9e5a033df87361e05dc643b (commit)
       via  c4b918b6c4acfde858cf9662631df105daf37efb (commit)
       via  e4f03b18bacb7e4bfe295672d393d6a00912010d (commit)
       via  a422ae9f3c0cc029f7d4982652f8cb08a9c2d8ab (commit)
      from  8dc477f85aead004447effaad6de8e9411bc1cc7 (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 d84dc02bd706694a97f99775239e5af67e6c6104
Author: Victor Julien <victor at inliniac.net>
Date:   Sat May 7 17:22:22 2016 +0200

    tcp sack: improve tests

commit fbf0a7aa45254405e2432a73cfa9935b5d181fba
Author: Victor Julien <victor at inliniac.net>
Date:   Sat May 7 17:21:04 2016 +0200

    detect app-layer-event: fix tests

commit 80716f860e72758cd032dec91376d056fb80743f
Author: Victor Julien <victor at inliniac.net>
Date:   Sat May 7 17:20:12 2016 +0200

    app-layer: test fixes

commit 90414472eda57134ca58cb9f338df2d169520896
Author: Victor Julien <victor at inliniac.net>
Date:   Fri May 13 18:35:26 2016 +0200

    thread storage: fix memset 0 after realloc

    Thread storage expansion would not properly memset 0 the new part
    of the memory.

commit 667e4e68bf01e0cc19d0cac501ae6d4df80095e9
Author: Jason Ish <ish at unx.ca>
Date:   Mon May 16 01:21:33 2016 -0600

    configure.ac: escape $srcdir when used in a variable

    $srcdir needs to be escaped for proper expansion when used
    as part of a Makefile variable.

commit 45342078e4032deb0916b0f7fb11f1471bf05ee7
Author: Mats Klepsland <mats.klepsland at gmail.com>
Date:   Fri May 13 08:00:19 2016 +0200

    tlsstore: fix memleak

    Bug #1771.

    Direct leak of 1834 byte(s) in 1 object(s) allocated from:
        #0 0x4e2e65 in realloc ??:?
        #1 0xcec27b in LogTlsLogPem /home/mats/suricata/src/log-tlsstore.c:130
        #2 0xcea4f5 in LogTlsStoreLogger /home/mats/suricata/src/log-tlsstore.c:303
        #3 0xd8b99c in OutputPacketLog /home/mats/suricata/src/output-packet.c:104

commit ed33f5f14859b6bbe2b290ee5351e9a445e1a9aa
Author: Mats Klepsland <mats.klepsland at gmail.com>
Date:   Thu May 12 08:14:52 2016 +0200

    tlsstore: use TxLogger

commit 77cc03505b3e59c73e359c71ffa9f696bb3eb8d9
Author: Mats Klepsland <mats.klepsland at gmail.com>
Date:   Thu May 12 08:11:53 2016 +0200

    output: add new tx logger to log at certain condition

    Some loggers needs certain conditions to be met before logging.
    This enables us to use conditions on the tx logger.

commit 663273a31e0903ad6f58849d4e1b4ac0052277a5
Author: Mats Klepsland <mats.klepsland at gmail.com>
Date:   Wed Apr 27 10:17:15 2016 +0200

    tls: change flag checking in SSLParserTest23

    Change flag checking in SSLParserTest23 to check each flag individually
    to enable adding more flags without the test failing.

commit 47a4daeeb88729af0efd56ce574ab81297c11117
Author: Mats Klepsland <mats.klepsland at gmail.com>
Date:   Fri Apr 15 09:19:36 2016 +0200

    output: allow more than one TLS logger

commit e9074bc829d1ef9932b5fdf420bd610775d8fb91
Author: Mats Klepsland <mats.klepsland at gmail.com>
Date:   Fri Apr 15 09:07:09 2016 +0200

    jsontls: use TxLogger

commit c6a61e009b65b19dbe745d23022fad518a24c369
Author: Mats Klepsland <mats.klepsland at gmail.com>
Date:   Thu Apr 14 09:51:18 2016 +0200

    tlslog: use TxLogger

commit 88bf866381f295cfde3805eab0a4cb1b0630f853
Author: Mats Klepsland <mats.klepsland at gmail.com>
Date:   Wed Apr 13 08:43:54 2016 +0200

    output-lua: use LuaTxLogger for TLS

commit fa6257b66ab4415ad51a0ca09a24cb6c65bd36ef
Author: Mats Klepsland <mats.klepsland at gmail.com>
Date:   Wed Apr 27 14:13:44 2016 +0200

    output: add new logger to log at specified state

    Sometimes we want to log when we reach a specified state instead of
    waiting for the session to end. E.g for TLS we want to log as soon
    as the handshake is done.

    To do this, a new logger is added, where it is possible to specify
    a custom "ProgressCompletionStatus".

commit 4166ec306414230d1b69fb28710824ba27c3af0d
Author: Mats Klepsland <mats.klepsland at gmail.com>
Date:   Wed May 4 13:37:04 2016 +0200

    template: register logger functions

commit 593f81527ac902f320136a6080a85a21648d55a6
Author: Mats Klepsland <mats.klepsland at gmail.com>
Date:   Wed May 4 13:25:03 2016 +0200

    modbus: register logger functions

commit c52fe9a5fa1761f3d8f334fbd13315f3ce921c70
Author: Mats Klepsland <mats.klepsland at gmail.com>
Date:   Wed May 4 13:16:03 2016 +0200

    http: register logger functions

commit d484812d05669b10e82a5f782666d7e57fe43955
Author: Mats Klepsland <mats.klepsland at gmail.com>
Date:   Wed May 4 12:53:55 2016 +0200

    smtp: register logger functions

commit dacb860d24f221fd7ad5a3fc775ad35f556717e0
Author: Mats Klepsland <mats.klepsland at gmail.com>
Date:   Wed May 4 12:35:06 2016 +0200

    dns: register logger functions

commit 1f98915ebe072e7af1c7c93a223d901f91f71c09
Author: Mats Klepsland <mats.klepsland at gmail.com>
Date:   Wed May 4 12:14:13 2016 +0200

    tls: register logger functions

commit f3599323e4ff649fa9e5a033df87361e05dc643b
Author: Mats Klepsland <mats.klepsland at gmail.com>
Date:   Wed May 4 11:03:57 2016 +0200

    tx: add functions for logging

    Add function AppLayerParserRegisterLoggerFuncs for registering
    a callback function for checking if a specific logger has logged
    a transaction, and a callback function for specifying that it has.

    Also add functions AppLayerParserGetTxLogged and
    AppLayerParserSetTxLogged to invoke these callback functions.

commit c4b918b6c4acfde858cf9662631df105daf37efb
Author: Mats Klepsland <mats.klepsland at gmail.com>
Date:   Wed May 4 10:00:26 2016 +0200

    tx: do not store ProgressCompletionStatus per ipproto

    Change AppLayerParserRegisterGetStateProgressCompletionStatus to
    only store one ProgressCompletionStatus callback function for each
    alproto, instead of storing one for each ipproto.

    This enables us to use AppLayerParserGetStateProgressCompletionStatus
    in functions where we do not know the ipproto used.

commit e4f03b18bacb7e4bfe295672d393d6a00912010d
Author: Mats Klepsland <mats.klepsland at gmail.com>
Date:   Wed Apr 13 08:28:16 2016 +0200

    tls: make TX aware

commit a422ae9f3c0cc029f7d4982652f8cb08a9c2d8ab
Author: Mats Klepsland <mats.klepsland at gmail.com>
Date:   Thu May 12 11:54:05 2016 +0200

    tls-sni: fix alignment issues

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

Summary of changes:
 configure.ac                  |   2 +-
 src/app-layer-dns-common.c    |  15 +++
 src/app-layer-dns-common.h    |   3 +
 src/app-layer-dns-tcp.c       |   4 +-
 src/app-layer-dns-udp.c       |   4 +-
 src/app-layer-htp.c           |  22 +++-
 src/app-layer-htp.h           |   4 +
 src/app-layer-modbus.c        |  19 ++-
 src/app-layer-modbus.h        |   1 +
 src/app-layer-parser.c        |  64 +++++++--
 src/app-layer-parser.h        |  13 +-
 src/app-layer-smtp.c          |  19 ++-
 src/app-layer-smtp.h          |   2 +
 src/app-layer-ssl.c           | 295 ++++++++++++++++++++++++++++++------------
 src/app-layer-ssl.h           |  30 ++++-
 src/app-layer-template.c      |  22 +++-
 src/app-layer-template.h      |   3 +
 src/app-layer-tls-handshake.c |  20 ++-
 src/app-layer.c               |  22 ++--
 src/detect-app-layer-event.c  | 147 +++++++--------------
 src/detect-engine-apt-event.c |   2 +-
 src/detect-engine-state.c     |   4 +-
 src/detect.c                  |   4 +
 src/log-tlslog.c              |  93 ++-----------
 src/log-tlsstore.c            |  43 +++---
 src/output-json-tls.c         | 104 +++------------
 src/output-lua.c              |  88 +------------
 src/output-streaming.c        |   8 +-
 src/output-tx.c               | 102 +++++++++++----
 src/output-tx.h               |   6 +-
 src/output.c                  | 120 +++++++++++++----
 src/output.h                  |  21 ++-
 src/runmodes.c                |   3 +-
 src/stream-tcp-sack.c         |  14 ++
 src/tm-threads.c              |   2 +-
 35 files changed, 749 insertions(+), 576 deletions(-)

hooks/post-receive
-- 
OISF