osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

The CRC8 routines don't modify the buffer; make the pointers to it const. 

This lets us get rid of some casts that provoke "drops const qualifier"
warnings.

Change-Id: Ia7e0863bd97bc20dbbb810e13778ec78d0cf3c91
Reviewed-on: https://code.wireshark.org/review/25837
Reviewed-by: Guy Harris <guy@alum.mit.edu>
This commit is contained in:
Guy Harris 2018-02-17 11:30:01 -08:00
parent dc8bd7c3a9
commit 8b9dfbaba9
3 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
epan/dissectors/packet-cipsafety.c
View File

@ -1274,7 +1274,7 @@ static guint8 compute_crc_s1_timestamp(guint8 pid_seed, guint8 mode_byte_mask, g
return timestamp_crc;
}
static guint8 compute_crc_s1_data(guint8 pid_seed, guint8 mode_byte_mask, guint8 *buf, int len)
static guint8 compute_crc_s1_data(guint8 pid_seed, guint8 mode_byte_mask, const guint8 *buf, int len)
{
guint8 mode_byte_crc = crc8_0x37(&mode_byte_mask, 1, pid_seed);
@ -1302,14 +1302,14 @@ static guint16 compute_crc_s3_pid(guint16 conn_serial_number, guint16 vendor_id,
return crc16_0x080F_seed(temp_buf, 8, 0);
}
static guint16 compute_crc_s3_base_data(guint16 pid_seed, guint8 mode_byte_mask, guint8 *buf, int len)
static guint16 compute_crc_s3_base_data(guint16 pid_seed, guint8 mode_byte_mask, const guint8 *buf, int len)
{
guint16 mode_byte_crc = crc16_0x080F_seed(&mode_byte_mask, 1, pid_seed);
return crc16_0x080F_seed(buf, len, mode_byte_crc);
}
static guint16 compute_crc_s3_extended_data(guint16 pid_seed, guint16 rollover_value, guint8 mode_byte_mask, guint8 *buf, int len)
static guint16 compute_crc_s3_extended_data(guint16 pid_seed, guint16 rollover_value, guint8 mode_byte_mask, const guint8 *buf, int len)
{
guint16 rollover_crc = crc16_0x080F_seed((guint8*)&rollover_value, 2, pid_seed);
guint16 mode_byte_crc = crc16_0x080F_seed(&mode_byte_mask, 1, rollover_crc);
@ -1337,7 +1337,7 @@ static guint32 compute_crc_s5_pid(guint16 conn_serial_number, guint16 vendor_id,
return crc32_0x5D6DCB_seed(temp_buf, 8, 0);
}
static guint32 compute_crc_s5_short_data(guint32 pid_seed, guint16 rollover_value, guint8 mode_byte_mask, guint16 timestamp_value, guint8 *buf, int len)
static guint32 compute_crc_s5_short_data(guint32 pid_seed, guint16 rollover_value, guint8 mode_byte_mask, guint16 timestamp_value, const guint8 *buf, int len)
{
guint32 rollover_crc = crc32_0x5D6DCB_seed((guint8*)&rollover_value, 2, pid_seed);
guint32 mode_byte_crc = crc32_0x5D6DCB_seed(&mode_byte_mask, 1, rollover_crc);
@ -1637,7 +1637,7 @@ dissect_cip_safety_data( proto_tree *tree, proto_item *item, tvbuff_t *tvb, int
hf_cipsafety_crc_s1, hf_cipsafety_crc_s1_status, &ei_cipsafety_crc_s1, pinfo,
compute_crc_s1_data(compute_crc_s1_pid(conn_sn, vendorID, device_sn),
(mode_byte & MODE_BYTE_CRC_S1_MASK),
(guint8*)tvb_get_ptr(tvb, 0, io_data_size), io_data_size),
tvb_get_ptr(tvb, 0, io_data_size), io_data_size),
ENC_LITTLE_ENDIAN, PROTO_CHECKSUM_VERIFY);
proto_tree_add_checksum(tree, tvb, io_data_size+2,
@ -1645,7 +1645,7 @@ dissect_cip_safety_data( proto_tree *tree, proto_item *item, tvbuff_t *tvb, int
compute_crc_s2_data(compute_crc_s1_pid(conn_sn, vendorID, device_sn),
((mode_byte ^ 0xFF) & MODE_BYTE_CRC_S1_MASK),
/* I/O data is duplicated because it will be complemented inline */
(guint8*)tvb_memdup(wmem_packet_scope(), tvb, 0, io_data_size), io_data_size),
tvb_memdup(wmem_packet_scope(), tvb, 0, io_data_size), io_data_size),
ENC_LITTLE_ENDIAN, PROTO_CHECKSUM_VERIFY);
}
else
@ -1704,7 +1704,7 @@ dissect_cip_safety_data( proto_tree *tree, proto_item *item, tvbuff_t *tvb, int
proto_tree_add_checksum(tree, tvb, io_data_size+1,
hf_cipsafety_crc_s3, hf_cipsafety_crc_s3_status, &ei_cipsafety_crc_s3, pinfo,
compute_crc_s3_base_data(compute_crc_s3_pid(conn_sn, vendorID, device_sn),
mode_byte & MODE_BYTE_CRC_S3_MASK, (guint8*)tvb_get_ptr(tvb, 0, io_data_size), io_data_size),
mode_byte & MODE_BYTE_CRC_S3_MASK, tvb_get_ptr(tvb, 0, io_data_size), io_data_size),
ENC_LITTLE_ENDIAN, PROTO_CHECKSUM_VERIFY);
}
else
@ -1724,7 +1724,7 @@ dissect_cip_safety_data( proto_tree *tree, proto_item *item, tvbuff_t *tvb, int
hf_cipsafety_complement_crc_s3, hf_cipsafety_complement_crc_s3_status, &ei_cipsafety_complement_crc_s3, pinfo,
compute_crc_s3_base_data(compute_crc_s3_pid(conn_sn, vendorID, device_sn),
((mode_byte ^ 0xFF) & MODE_BYTE_CRC_S3_MASK),
(guint8*)tvb_get_ptr(tvb, io_data_size+3, io_data_size), io_data_size),
tvb_get_ptr(tvb, io_data_size+3, io_data_size), io_data_size),
ENC_LITTLE_ENDIAN, PROTO_CHECKSUM_VERIFY);
}
else
@ -1813,7 +1813,7 @@ dissect_cip_safety_data( proto_tree *tree, proto_item *item, tvbuff_t *tvb, int
{
test_crc_c5 = compute_crc_s5_short_data(compute_crc_s5_pid(conn_sn, vendorID, device_sn),
((timestamp != 0) ? packet_data->rollover_value : 0), mode_byte & MODE_BYTE_CRC_S5_BASE_MASK, timestamp,
(guint8*)tvb_get_ptr(tvb, 0, io_data_size), io_data_size);
tvb_get_ptr(tvb, 0, io_data_size), io_data_size);
tmp_c5 = tvb_get_guint8(tvb, io_data_size+1);
value_c5 = tmp_c5;
@ -1890,7 +1890,7 @@ dissect_cip_safety_data( proto_tree *tree, proto_item *item, tvbuff_t *tvb, int
proto_tree_add_checksum(tree, tvb, io_data_size+1,
hf_cipsafety_crc_s3, hf_cipsafety_crc_s3_status, &ei_cipsafety_crc_s3, pinfo,
compute_crc_s3_extended_data(compute_crc_s3_pid(conn_sn, vendorID, device_sn),
((timestamp != 0) ? packet_data->rollover_value : 0), mode_byte & MODE_BYTE_CRC_S3_MASK, (guint8*)tvb_get_ptr(tvb, 0, io_data_size), io_data_size),
((timestamp != 0) ? packet_data->rollover_value : 0), mode_byte & MODE_BYTE_CRC_S3_MASK, tvb_get_ptr(tvb, 0, io_data_size), io_data_size),
ENC_LITTLE_ENDIAN, PROTO_CHECKSUM_VERIFY);
}
}
@ -1915,7 +1915,7 @@ dissect_cip_safety_data( proto_tree *tree, proto_item *item, tvbuff_t *tvb, int
test_crc_c5 = compute_crc_s5_long_data(compute_crc_s5_pid(conn_sn, vendorID, device_sn),
((timestamp != 0) ? packet_data->rollover_value : 0), mode_byte & MODE_BYTE_CRC_S5_EXTENDED_MASK, timestamp,
/* I/O data is duplicated because it will be complemented inline */
(guint8*)tvb_memdup(wmem_packet_scope(), tvb, 0, io_data_size), io_data_size);
tvb_memdup(wmem_packet_scope(), tvb, 0, io_data_size), io_data_size);
tmp_c5 = tvb_get_guint8(tvb, (io_data_size*2)+3);
value_c5 = tmp_c5;

8
wsutil/crc8.c
View File

@ -134,7 +134,7 @@ static const unsigned char crc8_precompiled_3b[256] =
* @param crc_table a table storing 256 entries for crc8 checksums
* @return the CRC8 checksum for the buffer
*/
static guint8 crc8_precompiled(guint8 *buf, guint32 len, guint8 seed, const guint8 crc_table[])
static guint8 crc8_precompiled(const guint8 *buf, guint32 len, guint8 seed, const guint8 crc_table[])
{
guint8 crc;
@ -152,7 +152,7 @@ static guint8 crc8_precompiled(guint8 *buf, guint32 len, guint8 seed, const guin
* @param seed The seed to use.
* @return the CRC8 checksum for the buffer
*/
guint8 crc8_0x2F(guint8 *buf, guint32 len, guint8 seed)
guint8 crc8_0x2F(const guint8 *buf, guint32 len, guint8 seed)
{
return crc8_precompiled(buf, len, seed, crc8_precompiled_2F);
}
@ -164,7 +164,7 @@ guint8 crc8_0x2F(guint8 *buf, guint32 len, guint8 seed)
* @param seed The seed to use.
* @return the CRC8 checksum for the buffer
*/
guint8 crc8_0x37(guint8 *buf, guint32 len, guint8 seed)
guint8 crc8_0x37(const guint8 *buf, guint32 len, guint8 seed)
{
guint8 crc = seed;
while (len-- > 0)
@ -181,7 +181,7 @@ guint8 crc8_0x37(guint8 *buf, guint32 len, guint8 seed)
* @param seed The seed to use.
* @return the CRC8 checksum for the buffer
*/
guint8 crc8_0x3B(guint8 *buf, guint32 len, guint8 seed)
guint8 crc8_0x3B(const guint8 *buf, guint32 len, guint8 seed)
{
guint8 crc = seed;
while (len-- > 0)

6
wsutil/crc8.h
View File

@ -27,7 +27,7 @@ extern "C" {
* @param seed The seed to use.
* @return the CRC8 checksum for the buffer
*/
WS_DLL_PUBLIC guint8 crc8_0x2F(guint8 *buf, guint32 len, guint8 seed);
WS_DLL_PUBLIC guint8 crc8_0x2F(const guint8 *buf, guint32 len, guint8 seed);
/** Calculates a CRC8 checksum for the given buffer with the polynom
* 0x37 using the precompiled CRC table
@ -36,7 +36,7 @@ WS_DLL_PUBLIC guint8 crc8_0x2F(guint8 *buf, guint32 len, guint8 seed);
* @param seed The seed to use.
* @return the CRC8 checksum for the buffer
*/
WS_DLL_PUBLIC guint8 crc8_0x37(guint8 *buf, guint32 len, guint8 seed);
WS_DLL_PUBLIC guint8 crc8_0x37(const guint8 *buf, guint32 len, guint8 seed);
/** Calculates a CRC8 checksum for the given buffer with the polynom
* 0x3B using the precompiled CRC table
@ -45,7 +45,7 @@ WS_DLL_PUBLIC guint8 crc8_0x37(guint8 *buf, guint32 len, guint8 seed);
* @param seed The seed to use.
* @return the CRC8 checksum for the buffer
*/
WS_DLL_PUBLIC guint8 crc8_0x3B(guint8 *buf, guint32 len, guint8 seed);
WS_DLL_PUBLIC guint8 crc8_0x3B(const guint8 *buf, guint32 len, guint8 seed);
#ifdef __cplusplus
}