![Alexander Wetzel](/assets/img/avatar_default.png)
- start decoding when we have eapol1+2 packets Do not insist on a complete captured handshake, decode what we can. - more robust way to detect eapol #2 packets At least Win 10 is violating the spec on rekey by setting the secure bit in #2. Unpatched version shows and handles #2 as #4, breaking decoding after rekey. - fixed eapol rekey key handling Inital patch (see https://code.wireshark.org/review/8268) is adding redundant keys, since it scans all the time and not only once. - ignore tailing garbage after eapol sections in frame See https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9065#c8 Included testcase to test decode for incomplete handshakes and eapol2 packets with secure bit set on rekey. Ping-Bug: 9065 Change-Id: Id775088db9b5aaa80da9efdeed6902d024b5c0cd Reviewed-on: https://code.wireshark.org/review/11484 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
116 lines
4.1 KiB
C
116 lines
4.1 KiB
C
/* airpcap_debug.h
|
|
*
|
|
* Copyright (c) 2006 CACE Technologies, Davis (California)
|
|
* All rights reserved.
|
|
*
|
|
* Redistribution and use in source and binary forms, with or without
|
|
* modification, are permitted provided that the following conditions
|
|
* are met:
|
|
* 1. Redistributions of source code must retain the above copyright
|
|
* notice, this list of conditions and the following disclaimer.
|
|
* 2. Redistributions in binary form must reproduce the above copyright
|
|
* notice, this list of conditions and the following disclaimer in the
|
|
* documentation and/or other materials provided with the distribution.
|
|
* 3. Neither the name of the project nor the names of its contributors
|
|
* may be used to endorse or promote products derived from this software
|
|
* without specific prior written permission.
|
|
*
|
|
* Alternatively, this software may be distributed under the terms of the
|
|
* GNU General Public License ("GPL") version 2 as published by the Free
|
|
* Software Foundation.
|
|
*
|
|
* THIS SOFTWARE IS PROVIDED BY THE PROJECT AND CONTRIBUTORS ``AS IS'' AND
|
|
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
|
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
|
* ARE DISCLAIMED. IN NO EVENT SHALL THE PROJECT OR CONTRIBUTORS BE LIABLE
|
|
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
|
|
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
|
|
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
|
|
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
|
|
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
|
|
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
|
* SUCH DAMAGE.
|
|
*/
|
|
|
|
#ifndef _AIRPDCAP_DEBUG_H
|
|
#define _AIRPDCAP_DEBUG_H
|
|
|
|
#include "airpdcap_interop.h"
|
|
|
|
void print_debug_line(const CHAR *function, const CHAR *msg, const INT level);
|
|
|
|
#ifdef _DEBUG
|
|
#ifdef __FUNCTION__
|
|
#define AIRPDCAP_DEBUG_PRINT_LINE(notdefined, msg, level) print_debug_line(__FUNCTION__, msg, level);
|
|
#else
|
|
#define AIRPDCAP_DEBUG_PRINT_LINE(function, msg, level) print_debug_line(function, msg, level);
|
|
#endif
|
|
#else
|
|
#ifdef __FUNCTION__
|
|
#define AIRPDCAP_DEBUG_PRINT_LINE(notdefined, msg, level)
|
|
#else
|
|
#define AIRPDCAP_DEBUG_PRINT_LINE(function, msg, level)
|
|
#endif
|
|
#endif
|
|
|
|
/******************************************************************************/
|
|
/* Debug section: internal function to print debug information */
|
|
/* */
|
|
#ifdef _DEBUG
|
|
#include <stdio.h>
|
|
#include <time.h>
|
|
|
|
#include <epan/to_str.h>
|
|
|
|
/* Debug level definition */
|
|
#define AIRPDCAP_DEBUG_LEVEL_1 1
|
|
#define AIRPDCAP_DEBUG_LEVEL_2 2
|
|
#define AIRPDCAP_DEBUG_LEVEL_3 3
|
|
#define AIRPDCAP_DEBUG_LEVEL_4 4
|
|
#define AIRPDCAP_DEBUG_LEVEL_5 5
|
|
|
|
#define AIRPDCAP_DEBUG_USED_LEVEL AIRPDCAP_DEBUG_LEVEL_3
|
|
|
|
#ifdef _TRACE
|
|
#ifdef __FUNCTION__
|
|
#define AIRPDCAP_DEBUG_TRACE_START(notdefined) print_debug_line(__FUNCTION__, "Start!", AIRPDCAP_DEBUG_USED_LEVEL);
|
|
#define AIRPDCAP_DEBUG_TRACE_END(notdefined) print_debug_line(__FUNCTION__, "End!", AIRPDCAP_DEBUG_USED_LEVEL);
|
|
#else
|
|
#define AIRPDCAP_DEBUG_TRACE_START(function) print_debug_line(function, "Start!", AIRPDCAP_DEBUG_USED_LEVEL);
|
|
#define AIRPDCAP_DEBUG_TRACE_END(function) print_debug_line(function, "End!", AIRPDCAP_DEBUG_USED_LEVEL);
|
|
#endif
|
|
#else
|
|
#ifdef __FUNCTION__
|
|
#define AIRPDCAP_DEBUG_TRACE_START(notdefined)
|
|
#define AIRPDCAP_DEBUG_TRACE_END(notdefined)
|
|
#else
|
|
#define AIRPDCAP_DEBUG_TRACE_START(function)
|
|
#define AIRPDCAP_DEBUG_TRACE_END(function)
|
|
#endif
|
|
#endif
|
|
|
|
static inline void DEBUG_DUMP(const char* x, guint8* y, int z)
|
|
{
|
|
char* tmp_str = bytes_to_str(NULL, (const guint8 *) y, (z));
|
|
g_warning("%s: %s", x, tmp_str);
|
|
wmem_free(NULL, tmp_str);
|
|
}
|
|
|
|
#else /* !defined _DEBUG */
|
|
|
|
#define AIRPDCAP_DEBUG_LEVEL_1
|
|
#define AIRPDCAP_DEBUG_LEVEL_2
|
|
#define AIRPDCAP_DEBUG_LEVEL_3
|
|
#define AIRPDCAP_DEBUG_LEVEL_4
|
|
#define AIRPDCAP_DEBUG_LEVEL_5
|
|
|
|
#define AIRPDCAP_DEBUG_TRACE_START(function)
|
|
#define AIRPDCAP_DEBUG_TRACE_END(function)
|
|
|
|
#define DEBUG_DUMP(x,y,z)
|
|
|
|
#endif /* ?defined _DEBUG */
|
|
|
|
|
|
#endif /* ?defined _AIRPDCAP_DEBUG_H */
|