forked from osmocom/wireshark
USBLL: Verify DATA packets CRC-16
Ping-Bug: 15908 Change-Id: Idda280545665184aca40c694ea6d639c9317307a Reviewed-on: https://code.wireshark.org/review/34016 Petri-Dish: Roland Knall <rknall@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
This commit is contained in:
Tomasz Moń
Anders Broman
parent
53fdec477d
commit
dd5f2bd054
|
|
@ -185,6 +185,7 @@ libwireshark.so.0 libwireshark0 #MINVER#
|
|||
crc16_plain_tvb_offset@Base 1.9.1
|
||||
crc16_plain_tvb_offset_seed@Base 1.9.1
|
||||
crc16_r3_ccitt_tvb@Base 1.99.3
|
||||
crc16_usb_tvb_offset@Base 3.1.0
|
||||
crc16_x25_ccitt_tvb@Base 1.9.1
|
||||
crc32_0x0AA725CF_tvb_offset_seed@Base 1.12.0~rc1
|
||||
crc32_802_tvb@Base 1.9.1
|
||||
|
|
|
|||
|
|
@ -29,6 +29,7 @@ libwsutil.so.0 libwsutil0 #MINVER#
|
|||
crc16_ccitt_seed@Base 1.10.0
|
||||
crc16_iso14443a@Base 2.1.0
|
||||
crc16_plain_update@Base 1.10.0
|
||||
crc16_usb@Base 3.1.0
|
||||
crc16_x25_ccitt_seed@Base 1.99.3
|
||||
crc32_0x5D6DCB_seed@Base 2.3.0
|
||||
crc32_0x0AA725CF_seed@Base 1.12.0~rc1
|
||||
|
|
|
|||
|
|
@ -96,6 +96,16 @@ guint16 crc16_iso14443a_tvb_offset(tvbuff_t *tvb, guint offset, guint len)
|
|||
return crc16_iso14443a(buf, len);
|
||||
}
|
||||
|
||||
guint16 crc16_usb_tvb_offset(tvbuff_t *tvb, guint offset, guint len)
|
||||
{
|
||||
const guint8 *buf;
|
||||
|
||||
tvb_ensure_bytes_exist(tvb, offset, len); /* len == -1 not allowed */
|
||||
buf = tvb_get_ptr(tvb, offset, len);
|
||||
|
||||
return crc16_usb(buf, len);
|
||||
}
|
||||
|
||||
guint16 crc16_plain_tvb_offset(tvbuff_t *tvb, guint offset, guint len)
|
||||
{
|
||||
guint16 crc = crc16_plain_init();
|
||||
|
|
|
|||
|
|
@ -72,6 +72,13 @@ WS_DLL_PUBLIC guint16 crc16_ccitt_tvb_offset_seed(tvbuff_t *tvb, guint offset,
|
|||
@return The calculated CRC_A. */
|
||||
WS_DLL_PUBLIC guint16 crc16_iso14443a_tvb_offset(tvbuff_t *tvb, guint offset, guint len);
|
||||
|
||||
/** Compute the 16bit CRC value of a tv buffer as defined in USB Standard.
|
||||
@param tvb The tv buffer containing the data.
|
||||
@param offset The offset into the tv buffer.
|
||||
@param len The number of bytes to include in the computation.
|
||||
@return The calculated CRC. */
|
||||
WS_DLL_PUBLIC guint16 crc16_usb_tvb_offset(tvbuff_t *tvb, guint offset, guint len);
|
||||
|
||||
/** Compute the "plain" CRC16 checksum of a tv buffer using the following
|
||||
* parameters:
|
||||
* Width = 16
|
||||
|
|
|
|||
|
|
@ -16,6 +16,7 @@
|
|||
#include "config.h"
|
||||
#include <epan/packet.h>
|
||||
#include <epan/expert.h>
|
||||
#include <epan/crc16-tvb.h>
|
||||
|
||||
static int proto_usbll = -1;
|
||||
|
||||
|
|
@ -26,6 +27,7 @@ static int hf_usbll_endp = -1;
|
|||
static int hf_usbll_crc5 = -1;
|
||||
static int hf_usbll_data = -1;
|
||||
static int hf_usbll_data_crc = -1;
|
||||
static int hf_usbll_data_crc_status = -1;
|
||||
static int hf_usbll_sof_framenum = -1;
|
||||
static int hf_usbll_split_hub_addr = -1;
|
||||
static int hf_usbll_split_sc = -1;
|
||||
|
|
@ -40,6 +42,7 @@ static int ett_usbll = -1;
|
|||
|
||||
static expert_field ei_invalid_pid = EI_INIT;
|
||||
static expert_field ei_undecoded = EI_INIT;
|
||||
static expert_field ei_wrong_crc16 = EI_INIT;
|
||||
|
||||
static dissector_handle_t usbll_handle;
|
||||
|
||||
|
|
@ -174,7 +177,10 @@ dissect_usbll_packet(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree,
|
|||
proto_tree_add_item(tree, hf_usbll_data, tvb, offset, data_size, ENC_NA);
|
||||
offset += data_size;
|
||||
}
|
||||
proto_tree_add_item(tree, hf_usbll_data_crc, tvb, offset, 2, ENC_LITTLE_ENDIAN);
|
||||
proto_tree_add_checksum(tree, tvb, offset,
|
||||
hf_usbll_data_crc, hf_usbll_data_crc_status, &ei_wrong_crc16, pinfo,
|
||||
crc16_usb_tvb_offset(tvb, 1, offset - 1),
|
||||
ENC_LITTLE_ENDIAN, PROTO_CHECKSUM_VERIFY);
|
||||
offset += 2;
|
||||
break;
|
||||
}
|
||||
|
|
@ -278,6 +284,10 @@ proto_register_usbll(void)
|
|||
{ "CRC", "usbll.crc16",
|
||||
FT_UINT16, BASE_HEX, NULL, 0x0000,
|
||||
NULL, HFILL }},
|
||||
{ &hf_usbll_data_crc_status,
|
||||
{ "CRC Status", "usbll.crc16.status",
|
||||
FT_UINT8, BASE_NONE, VALS(proto_checksum_vals), 0,
|
||||
NULL, HFILL }},
|
||||
{ &hf_usbll_sof_framenum,
|
||||
{ "Frame Number", "usbll.frame_num",
|
||||
FT_UINT16, BASE_DEC, NULL, 0x07FF,
|
||||
|
|
@ -320,6 +330,7 @@ proto_register_usbll(void)
|
|||
static ei_register_info ei[] = {
|
||||
{ &ei_invalid_pid, { "usbll.invalid_pid", PI_MALFORMED, PI_ERROR, "Invalid USB Packet ID", EXPFILL }},
|
||||
{ &ei_undecoded, { "usbll.undecoded", PI_UNDECODED, PI_WARN, "Not dissected yet (report to wireshark.org)", EXPFILL }},
|
||||
{ &ei_wrong_crc16, { "usbll.crc16.wrong", PI_PROTOCOL, PI_WARN, "Wrong CRC", EXPFILL }},
|
||||
};
|
||||
|
||||
static gint *ett[] = {
|
||||
|
|
|
|||
|
|
@ -318,9 +318,59 @@ static const guint crc16_precompiled_080F[] =
|
|||
0xFD05, 0xF50A, 0xED1B, 0xE514, 0xDD39, 0xD536, 0xCD27, 0xC528
|
||||
};
|
||||
|
||||
/**
|
||||
* Generated on Fri Jul 19 17:16:42 2019
|
||||
* by pycrc v0.9.2, https://pycrc.org
|
||||
* using the configuration:
|
||||
* - Width = 16
|
||||
* - Poly = 0x8005
|
||||
* - XorIn = 0xffff
|
||||
* - ReflectIn = True
|
||||
* - XorOut = 0xffff
|
||||
* - ReflectOut = True
|
||||
* - Algorithm = table-driven
|
||||
*/
|
||||
static const guint crc16_usb_table[] = {
|
||||
0x0000, 0xc0c1, 0xc181, 0x0140, 0xc301, 0x03c0, 0x0280, 0xc241,
|
||||
0xc601, 0x06c0, 0x0780, 0xc741, 0x0500, 0xc5c1, 0xc481, 0x0440,
|
||||
0xcc01, 0x0cc0, 0x0d80, 0xcd41, 0x0f00, 0xcfc1, 0xce81, 0x0e40,
|
||||
0x0a00, 0xcac1, 0xcb81, 0x0b40, 0xc901, 0x09c0, 0x0880, 0xc841,
|
||||
0xd801, 0x18c0, 0x1980, 0xd941, 0x1b00, 0xdbc1, 0xda81, 0x1a40,
|
||||
0x1e00, 0xdec1, 0xdf81, 0x1f40, 0xdd01, 0x1dc0, 0x1c80, 0xdc41,
|
||||
0x1400, 0xd4c1, 0xd581, 0x1540, 0xd701, 0x17c0, 0x1680, 0xd641,
|
||||
0xd201, 0x12c0, 0x1380, 0xd341, 0x1100, 0xd1c1, 0xd081, 0x1040,
|
||||
0xf001, 0x30c0, 0x3180, 0xf141, 0x3300, 0xf3c1, 0xf281, 0x3240,
|
||||
0x3600, 0xf6c1, 0xf781, 0x3740, 0xf501, 0x35c0, 0x3480, 0xf441,
|
||||
0x3c00, 0xfcc1, 0xfd81, 0x3d40, 0xff01, 0x3fc0, 0x3e80, 0xfe41,
|
||||
0xfa01, 0x3ac0, 0x3b80, 0xfb41, 0x3900, 0xf9c1, 0xf881, 0x3840,
|
||||
0x2800, 0xe8c1, 0xe981, 0x2940, 0xeb01, 0x2bc0, 0x2a80, 0xea41,
|
||||
0xee01, 0x2ec0, 0x2f80, 0xef41, 0x2d00, 0xedc1, 0xec81, 0x2c40,
|
||||
0xe401, 0x24c0, 0x2580, 0xe541, 0x2700, 0xe7c1, 0xe681, 0x2640,
|
||||
0x2200, 0xe2c1, 0xe381, 0x2340, 0xe101, 0x21c0, 0x2080, 0xe041,
|
||||
0xa001, 0x60c0, 0x6180, 0xa141, 0x6300, 0xa3c1, 0xa281, 0x6240,
|
||||
0x6600, 0xa6c1, 0xa781, 0x6740, 0xa501, 0x65c0, 0x6480, 0xa441,
|
||||
0x6c00, 0xacc1, 0xad81, 0x6d40, 0xaf01, 0x6fc0, 0x6e80, 0xae41,
|
||||
0xaa01, 0x6ac0, 0x6b80, 0xab41, 0x6900, 0xa9c1, 0xa881, 0x6840,
|
||||
0x7800, 0xb8c1, 0xb981, 0x7940, 0xbb01, 0x7bc0, 0x7a80, 0xba41,
|
||||
0xbe01, 0x7ec0, 0x7f80, 0xbf41, 0x7d00, 0xbdc1, 0xbc81, 0x7c40,
|
||||
0xb401, 0x74c0, 0x7580, 0xb541, 0x7700, 0xb7c1, 0xb681, 0x7640,
|
||||
0x7200, 0xb2c1, 0xb381, 0x7340, 0xb101, 0x71c0, 0x7080, 0xb041,
|
||||
0x5000, 0x90c1, 0x9181, 0x5140, 0x9301, 0x53c0, 0x5280, 0x9241,
|
||||
0x9601, 0x56c0, 0x5780, 0x9741, 0x5500, 0x95c1, 0x9481, 0x5440,
|
||||
0x9c01, 0x5cc0, 0x5d80, 0x9d41, 0x5f00, 0x9fc1, 0x9e81, 0x5e40,
|
||||
0x5a00, 0x9ac1, 0x9b81, 0x5b40, 0x9901, 0x59c0, 0x5880, 0x9841,
|
||||
0x8801, 0x48c0, 0x4980, 0x8941, 0x4b00, 0x8bc1, 0x8a81, 0x4a40,
|
||||
0x4e00, 0x8ec1, 0x8f81, 0x4f40, 0x8d01, 0x4dc0, 0x4c80, 0x8c41,
|
||||
0x4400, 0x84c1, 0x8581, 0x4540, 0x8701, 0x47c0, 0x4680, 0x8641,
|
||||
0x8201, 0x42c0, 0x4380, 0x8341, 0x4100, 0x81c1, 0x8081, 0x4040
|
||||
};
|
||||
|
||||
static const guint16 crc16_ccitt_start = 0xFFFF;
|
||||
static const guint16 crc16_ccitt_xorout = 0xFFFF;
|
||||
|
||||
static const guint16 crc16_usb_start = 0xFFFF;
|
||||
static const guint16 crc16_usb_xorout = 0xFFFF;
|
||||
|
||||
/* two types of crcs are possible: unreflected (bits shift left) and
|
||||
* reflected (bits shift right).
|
||||
*/
|
||||
|
|
@ -379,6 +429,12 @@ guint16 crc16_iso14443a(const guint8 *buf, guint len)
|
|||
return crc16_reflected(buf,len, 0x6363 ,crc16_ccitt_table_reverse);
|
||||
}
|
||||
|
||||
guint16 crc16_usb(const guint8 *buf, guint len)
|
||||
{
|
||||
return crc16_reflected(buf, len, crc16_usb_start, crc16_usb_table)
|
||||
^ crc16_usb_xorout;
|
||||
}
|
||||
|
||||
guint16 crc16_0x5935(const guint8 *buf, guint32 len, guint16 seed)
|
||||
{
|
||||
return crc16_unreflected(buf, len, seed, crc16_precompiled_5935);
|
||||
|
|
|
|||
|
|
@ -55,6 +55,12 @@ WS_DLL_PUBLIC guint16 crc16_ccitt_seed(const guint8 *buf, guint len, guint16 see
|
|||
@return the CRC16 checksum for the buffer */
|
||||
WS_DLL_PUBLIC guint16 crc16_iso14443a(const guint8 *buf, guint len);
|
||||
|
||||
/** Compute the 16bit CRC value of a buffer as defined in USB Specification.
|
||||
@param buf The buffer containing the data.
|
||||
@param len The number of bytes to include in the computation.
|
||||
@return the CRC16 checksum for the buffer */
|
||||
WS_DLL_PUBLIC guint16 crc16_usb(const guint8 *buf, guint len);
|
||||
|
||||
/** Calculates a CRC16 checksum for the given buffer with the polynom
|
||||
* 0x5935 using a precompiled CRC table
|
||||
* @param buf a pointer to a buffer of the given length
|
||||
|
|
|
|||
Loading…
Reference in New Issue