From cf95dec4209236fc7fc6b07facb0c47167019b3f Mon Sep 17 00:00:00 2001 From: "Russ Combs (rucombs)" Date: Tue, 1 Dec 2015 09:17:12 -0500 Subject: [PATCH] Merge pull request #162 in SNORT/snort3 from crc/license to master Squashed commit of the following: commit 69aabcdba370c3f630b02ff0c825341e332a97df Author: Russ Combs Date: Tue Dec 1 08:55:50 2015 -0500 copyright year and license format fixups for consistency output hyperscan version with -V if available --- src/ips_options/ips_hash.cc | 2 +- src/service_inspectors/dnp3/dnp3.cc | 2 +- src/service_inspectors/dnp3/dnp3.h | 2 +- src/service_inspectors/dnp3/dnp3_map.h | 2 +- src/service_inspectors/dnp3/dnp3_paf.cc | 2 +- src/service_inspectors/imap/imap.cc | 2 +- src/service_inspectors/imap/imap.h | 2 +- src/service_inspectors/imap/imap_config.h | 2 +- src/service_inspectors/imap/imap_paf.cc | 36 +++++++++++------------ src/service_inspectors/pop/pop.cc | 2 +- src/service_inspectors/pop/pop.h | 2 +- src/service_inspectors/pop/pop_config.h | 2 +- src/service_inspectors/pop/pop_paf.cc | 36 +++++++++++------------ src/service_inspectors/smtp/smtp_config.h | 2 +- src/utils/util.cc | 11 +++++-- 15 files changed, 55 insertions(+), 52 deletions(-) diff --git a/src/ips_options/ips_hash.cc b/src/ips_options/ips_hash.cc index 6a3b053fc..1440cf58b 100644 --- a/src/ips_options/ips_hash.cc +++ b/src/ips_options/ips_hash.cc @@ -1,5 +1,5 @@ //-------------------------------------------------------------------------- -// Copyright (C) 2015 Cisco and/or its affiliates. All rights reserved. +// Copyright (C) 2015-2015 Cisco and/or its affiliates. All rights reserved. // // This program is free software; you can redistribute it and/or modify it // under the terms of the GNU General Public License Version 2 as published diff --git a/src/service_inspectors/dnp3/dnp3.cc b/src/service_inspectors/dnp3/dnp3.cc index 8ef7a536a..a78a225eb 100644 --- a/src/service_inspectors/dnp3/dnp3.cc +++ b/src/service_inspectors/dnp3/dnp3.cc @@ -1,5 +1,5 @@ //-------------------------------------------------------------------------- -// Copyright (C) 2015 Cisco and/or its affiliates. All rights reserved. +// Copyright (C) 2015-2015 Cisco and/or its affiliates. All rights reserved. // // This program is free software; you can redistribute it and/or modify it // under the terms of the GNU General Public License Version 2 as published diff --git a/src/service_inspectors/dnp3/dnp3.h b/src/service_inspectors/dnp3/dnp3.h index 7151bd04f..8c56f87c1 100644 --- a/src/service_inspectors/dnp3/dnp3.h +++ b/src/service_inspectors/dnp3/dnp3.h @@ -1,5 +1,5 @@ //-------------------------------------------------------------------------- -// Copyright (C) 2015 Cisco and/or its affiliates. All rights reserved. +// Copyright (C) 2015-2015 Cisco and/or its affiliates. All rights reserved. // // This program is free software; you can redistribute it and/or modify it // under the terms of the GNU General Public License Version 2 as published diff --git a/src/service_inspectors/dnp3/dnp3_map.h b/src/service_inspectors/dnp3/dnp3_map.h index 6b4c0d30c..7db54f589 100644 --- a/src/service_inspectors/dnp3/dnp3_map.h +++ b/src/service_inspectors/dnp3/dnp3_map.h @@ -1,5 +1,5 @@ //-------------------------------------------------------------------------- -// Copyright (C) 2015 Cisco and/or its affiliates. All rights reserved. +// Copyright (C) 2015-2015 Cisco and/or its affiliates. All rights reserved. // Copyright (C) 2011-2013 Sourcefire, Inc. // // This program is free software; you can redistribute it and/or modify it diff --git a/src/service_inspectors/dnp3/dnp3_paf.cc b/src/service_inspectors/dnp3/dnp3_paf.cc index 470535795..c72a55230 100644 --- a/src/service_inspectors/dnp3/dnp3_paf.cc +++ b/src/service_inspectors/dnp3/dnp3_paf.cc @@ -1,5 +1,5 @@ //-------------------------------------------------------------------------- -// Copyright (C) 2015 Cisco and/or its affiliates. All rights reserved. +// Copyright (C) 2015-2015 Cisco and/or its affiliates. All rights reserved. // // This program is free software; you can redistribute it and/or modify it // under the terms of the GNU General Public License Version 2 as published diff --git a/src/service_inspectors/imap/imap.cc b/src/service_inspectors/imap/imap.cc index 467d36bfc..4ab188015 100644 --- a/src/service_inspectors/imap/imap.cc +++ b/src/service_inspectors/imap/imap.cc @@ -1,5 +1,5 @@ //-------------------------------------------------------------------------- -// Copyright (C) 2015 Cisco and/or its affiliates. All rights reserved. +// Copyright (C) 2015-2015 Cisco and/or its affiliates. All rights reserved. // // This program is free software; you can redistribute it and/or modify it // under the terms of the GNU General Public License Version 2 as published diff --git a/src/service_inspectors/imap/imap.h b/src/service_inspectors/imap/imap.h index 3cdb885ba..9ea7d339c 100644 --- a/src/service_inspectors/imap/imap.h +++ b/src/service_inspectors/imap/imap.h @@ -1,5 +1,5 @@ //-------------------------------------------------------------------------- -// Copyright (C) 2015 Cisco and/or its affiliates. All rights reserved. +// Copyright (C) 2015-2015 Cisco and/or its affiliates. All rights reserved. // // This program is free software; you can redistribute it and/or modify it // under the terms of the GNU General Public License Version 2 as published diff --git a/src/service_inspectors/imap/imap_config.h b/src/service_inspectors/imap/imap_config.h index 7a0dd6596..21bd06dc8 100644 --- a/src/service_inspectors/imap/imap_config.h +++ b/src/service_inspectors/imap/imap_config.h @@ -1,5 +1,5 @@ //-------------------------------------------------------------------------- -// Copyright (C) 2015 Cisco and/or its affiliates. All rights reserved. +// Copyright (C) 2015-2015 Cisco and/or its affiliates. All rights reserved. // // This program is free software; you can redistribute it and/or modify it // under the terms of the GNU General Public License Version 2 as published diff --git a/src/service_inspectors/imap/imap_paf.cc b/src/service_inspectors/imap/imap_paf.cc index 7393d218c..908bb6bde 100644 --- a/src/service_inspectors/imap/imap_paf.cc +++ b/src/service_inspectors/imap/imap_paf.cc @@ -1,22 +1,20 @@ -/**************************************************************************** - * Copyright (C) 2015 Cisco and/or its affiliates. All rights reserved. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License Version 2 as - * published by the Free Software Foundation. You may not use, modify or - * distribute this program under any other version of the GNU General - * Public License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - * - ****************************************************************************/ +//-------------------------------------------------------------------------- +// Copyright (C) 2015-2015 Cisco and/or its affiliates. All rights reserved. +// +// This program is free software; you can redistribute it and/or modify it +// under the terms of the GNU General Public License Version 2 as published +// by the Free Software Foundation. You may not use, modify or distribute +// this program under any other version of the GNU General Public License. +// +// This program is distributed in the hope that it will be useful, but +// WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License along +// with this program; if not, write to the Free Software Foundation, Inc., +// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +//-------------------------------------------------------------------------- #include diff --git a/src/service_inspectors/pop/pop.cc b/src/service_inspectors/pop/pop.cc index 6008e34a8..44b6908cb 100644 --- a/src/service_inspectors/pop/pop.cc +++ b/src/service_inspectors/pop/pop.cc @@ -1,5 +1,5 @@ //-------------------------------------------------------------------------- -// Copyright (C) 2015 Cisco and/or its affiliates. All rights reserved. +// Copyright (C) 2015-2015 Cisco and/or its affiliates. All rights reserved. // // This program is free software; you can redistribute it and/or modify it // under the terms of the GNU General Public License Version 2 as published diff --git a/src/service_inspectors/pop/pop.h b/src/service_inspectors/pop/pop.h index 257c4d1be..26ecbbc69 100644 --- a/src/service_inspectors/pop/pop.h +++ b/src/service_inspectors/pop/pop.h @@ -1,5 +1,5 @@ //-------------------------------------------------------------------------- -// Copyright (C) 2015 Cisco and/or its affiliates. All rights reserved. +// Copyright (C) 2015-2015 Cisco and/or its affiliates. All rights reserved. // // This program is free software; you can redistribute it and/or modify it // under the terms of the GNU General Public License Version 2 as published diff --git a/src/service_inspectors/pop/pop_config.h b/src/service_inspectors/pop/pop_config.h index ad61208ef..10e5c88f4 100644 --- a/src/service_inspectors/pop/pop_config.h +++ b/src/service_inspectors/pop/pop_config.h @@ -1,5 +1,5 @@ //-------------------------------------------------------------------------- -// Copyright (C) 2015 Cisco and/or its affiliates. All rights reserved. +// Copyright (C) 2015-2015 Cisco and/or its affiliates. All rights reserved. // // This program is free software; you can redistribute it and/or modify it // under the terms of the GNU General Public License Version 2 as published diff --git a/src/service_inspectors/pop/pop_paf.cc b/src/service_inspectors/pop/pop_paf.cc index 46d338ed4..26649eac4 100644 --- a/src/service_inspectors/pop/pop_paf.cc +++ b/src/service_inspectors/pop/pop_paf.cc @@ -1,22 +1,20 @@ -/**************************************************************************** - * Copyright (C) 2015 Cisco and/or its affiliates. All rights reserved. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License Version 2 as - * published by the Free Software Foundation. You may not use, modify or - * distribute this program under any other version of the GNU General - * Public License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - * - ****************************************************************************/ +//-------------------------------------------------------------------------- +// Copyright (C) 2015-2015 Cisco and/or its affiliates. All rights reserved. +// +// This program is free software; you can redistribute it and/or modify it +// under the terms of the GNU General Public License Version 2 as published +// by the Free Software Foundation. You may not use, modify or distribute +// this program under any other version of the GNU General Public License. +// +// This program is distributed in the hope that it will be useful, but +// WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License along +// with this program; if not, write to the Free Software Foundation, Inc., +// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +//-------------------------------------------------------------------------- #include "pop_paf.h" diff --git a/src/service_inspectors/smtp/smtp_config.h b/src/service_inspectors/smtp/smtp_config.h index f9bab71de..218194367 100644 --- a/src/service_inspectors/smtp/smtp_config.h +++ b/src/service_inspectors/smtp/smtp_config.h @@ -1,5 +1,5 @@ //-------------------------------------------------------------------------- -// Copyright (C) 2015 Cisco and/or its affiliates. All rights reserved. +// Copyright (C) 2015-2015 Cisco and/or its affiliates. All rights reserved. // // This program is free software; you can redistribute it and/or modify it // under the terms of the GNU General Public License Version 2 as published diff --git a/src/utils/util.cc b/src/utils/util.cc index be5488002..35e77c566 100644 --- a/src/utils/util.cc +++ b/src/utils/util.cc @@ -52,6 +52,10 @@ #include #endif +#ifdef HAVE_HYPERSCAN +#include +#endif + #include #include #include @@ -123,8 +127,8 @@ int DisplayBanner(void) VERSION, BUILD, info); LogMessage(" '''' By Martin Roesch & The Snort Team\n"); LogMessage(" http://snort.org/contact#team\n"); - LogMessage( - " Copyright (C) 2014-2015 Cisco and/or its affiliates. All rights reserved.\n"); + LogMessage(" Copyright (C) 2014-2015 Cisco and/or its affiliates." + " All rights reserved.\n"); LogMessage(" Copyright (C) 1998-2013 Sourcefire, Inc., et al.\n"); #ifdef HAVE_PCAP_LIB_VERSION LogMessage(" Using %s\n", pcap_lib_version()); @@ -137,6 +141,9 @@ int DisplayBanner(void) #endif #ifdef HAVE_OPENSSL_SHA LogMessage(" Using %s\n", SSLeay_version(SSLEAY_VERSION)); +#endif +#ifdef HAVE_HYPERSCAN + LogMessage(" Using Hyperscan version %s\n", hs_version()); #endif LogMessage("\n"); -- 2.47.3