osmocom
/
wireshark
11
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

Add casting and license info to fix buildbots 

Change-Id: Iea53b17480d758c16822d80778fa4f186a188a91
Reviewed-on: https://code.wireshark.org/review/2470
Reviewed-by: Evan Huus <eapache@gmail.com>
This commit is contained in:
Evan Huus 2014-06-19 16:55:28 -07:00
parent cdb68020ee
commit 0c3e1a243b
4 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
epan/dissectors/packet-corosync-totemnet.c
View File

@ -279,7 +279,7 @@ dissect_corosynec_totemnet_with_decryption(tvbuff_t *tvb,
#define PRIVATE_KEY_LEN_MAX 256 #define PRIVATE_KEY_LEN_MAX 256
gchar private_key[PRIVATE_KEY_LEN_MAX]; gchar private_key[PRIVATE_KEY_LEN_MAX];
unsigned int private_key_len; gsize private_key_len;
unsigned char* hash_digest; unsigned char* hash_digest;
unsigned char* salt; unsigned char* salt;

2
epan/dissectors/packet-corosync-totemsrp.c
View File

@ -292,7 +292,7 @@ dissect_corosync_totemsrp_ip_address(tvbuff_t *tvb,
if (len != sizeof(struct e_in6_addr)) { if (len != sizeof(struct e_in6_addr)) {
gint padding_len; gint padding_len;
padding_len = (sizeof(struct e_in6_addr) - len); padding_len = (gint)(sizeof(struct e_in6_addr) - len);
proto_tree_add_item (tree, hf_corosync_totemsrp_ip_address_addr4_padding, proto_tree_add_item (tree, hf_corosync_totemsrp_ip_address_addr4_padding,
tvb, offset, padding_len, FALSE); tvb, offset, padding_len, FALSE);
offset += padding_len; offset += padding_len;

7
wsutil/sober128.c
View File

@ -2,7 +2,10 @@
cluster engine. corosync cluster engine borrows the implementation cluster engine. corosync cluster engine borrows the implementation
from LibTomCrypt. from LibTomCrypt.
The latest version of the original code can be found at http://libtom.org */ The latest version of the original code can be found at
http://libtom.org/?page=features according to which this code is in the
Public Domain
*/
/* About LibTomCrypt: /* About LibTomCrypt:
* --------------------------------------------------------------------- * ---------------------------------------------------------------------
@ -14,7 +17,7 @@
* The library is free for all purposes without any express * The library is free for all purposes without any express
* guarantee it works. * guarantee it works.
* *
* Tom St Denis, tomstdenis@iahu.ca, http://libtomcrypt.com * Tom St Denis, tomstdenis@iahu.ca, http://libtom.org/?page=features
*/ */
#include "sober128.h" #include "sober128.h"

7
wsutil/sober128.h
View File

@ -2,7 +2,10 @@
cluster engine. corosync cluster engine borrows the implementation cluster engine. corosync cluster engine borrows the implementation
from LibTomCrypt. from LibTomCrypt.
The latest version of the original code can be found at http://libtom.org */ The latest version of the original code can be found at
http://libtom.org/?page=features according to which this code is in the
Public Domain
*/
/* About LibTomCrypt: /* About LibTomCrypt:
* --------------------------------------------------------------------- * ---------------------------------------------------------------------
@ -14,7 +17,7 @@
* The library is free for all purposes without any express * The library is free for all purposes without any express
* guarantee it works. * guarantee it works.
* *
* Tom St Denis, tomstdenis@iahu.ca, http://libtomcrypt.com * Tom St Denis, tomstdenis@iahu.ca, http://libtom.org/?page=features
*/ */
#ifndef _SOBER127_H #ifndef _SOBER127_H