[Oisf-devel] [COMMIT] OISF branch, master, updated. suricata-2.0rc1-69-g00d2f2d

[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  00d2f2d627bfe3eb1245dda28033a459fb55de27 (commit)
       via  88e9c85e36fd4901b6ed1b56a552d37b93942c89 (commit)
       via  872bb5664ec6bda9ff7e88a2b7ef0685f43e1cae (commit)
       via  684d7875677a0f9ec4cf3bd71afe81bdfd6f3110 (commit)
       via  ddf9b417d725e0f56df585cabb40a28cea85250f (commit)
       via  1e21b9f5a9fa267ae66a1d120cb4a7f6120e67e0 (commit)
       via  a7460955697734a1d13192fb4357c960f1c1965c (commit)
      from  f6bb867df8ee4ec0ac4a5379c645c78a12ef175b (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 00d2f2d627bfe3eb1245dda28033a459fb55de27
Author: Victor Julien <victor at inliniac.net>
Date:   Tue Mar 4 12:42:16 2014 +0100

    Fix BytesToString indexing array using wrong index
    
    This would lead to reading past the end of the buffer and also writing
    past the end of the newly allocated buffer.
    
    Bug #1121

commit 88e9c85e36fd4901b6ed1b56a552d37b93942c89
Author: Victor Julien <victor at inliniac.net>
Date:   Tue Mar 4 11:30:08 2014 +0100

    json output: fix vlan byte order in output
    
    VLAN functions/macros return vlan id in host byte order, so no need
    to convert them in output functions.

commit 872bb5664ec6bda9ff7e88a2b7ef0685f43e1cae
Author: Victor Julien <victor at inliniac.net>
Date:   Tue Mar 4 11:13:37 2014 +0100

    Fix null dereference in eve-log
    
    Eve-log would call GET_VLAN_ID on the packets vlan header if p->vlan_idx
    was bigger than 0. GET_VLAN_ID would then unconditionally dereference
    p->vlanh[0] or [1]. However, there are a number of cases in which these
    pointers are not set. Defrag pseudo packets, AF_PACKET and in the future
    PF_RING, do set the id's, but not the header pointers.
    
    This patch adds 2 new macro's which are wrappers around a function:
    
    VLAN_GET_ID1 and VLAN_GET_ID2 get the id's by calling DecodeVLANGetId.
    
    This function will return the correct id.
    
    Bug #1120.

commit 684d7875677a0f9ec4cf3bd71afe81bdfd6f3110
Author: Victor Julien <victor at inliniac.net>
Date:   Tue Mar 4 09:55:59 2014 +0100

    Coverity fix
    
    Coverity 992695, fix potential array index with negative int. Very unlikely
    case at rule keyword parsing stage.

commit ddf9b417d725e0f56df585cabb40a28cea85250f
Author: Victor Julien <victor at inliniac.net>
Date:   Wed Feb 26 22:01:52 2014 +0100

    configure: simplify OpenBSD handling
    
    Treat all OpenBSD versions in the same way. No more -fgnu89-inline.

commit 1e21b9f5a9fa267ae66a1d120cb4a7f6120e67e0
Author: Victor Julien <victor at inliniac.net>
Date:   Wed Feb 26 17:59:21 2014 +0100

    Disable emerging-icmp in default config
    
    The file has no active rules by default.

commit a7460955697734a1d13192fb4357c960f1c1965c
Author: Victor Julien <victor at inliniac.net>
Date:   Wed Feb 26 17:58:01 2014 +0100

    make install-full: get correct version of ET
    
    Version 2.0.

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

Summary of changes:
 Makefile.am               |    4 ++--
 configure.ac              |   14 +-------------
 src/decode-vlan.c         |   13 +++++++++++++
 src/decode-vlan.h         |    7 +++++++
 src/detect-byte-extract.c |    2 ++
 src/output-json.c         |    6 +++---
 src/util-byte.c           |    4 ++--
 suricata.yaml.in          |    2 +-
 8 files changed, 31 insertions(+), 21 deletions(-)


hooks/post-receive
-- 
OISF