diff options
| author | Peter Wu <peter@lekensteyn.nl> | 2016-09-16 10:03:12 +0200 |
|---|---|---|
| committer | Alexis La Goutte <alexis.lagoutte@gmail.com> | 2016-09-16 11:27:39 +0000 |
| commit | 663031e4a84850fdeeab52cd36f44117664b285c (patch) | |
| tree | 786827aa170fa9ca9a6301111e91ea0a88c0a8ad /epan | |
| parent | 6d13aebde939c8d3eb3f60410dbeb953b139a299 (diff) | |
ssl-utils: fix -Wshorten-64-to-32 and other warnings
Fixes -Wshorten-64-to-32 from v2.3.0rc0-697-gb1d36fe ("ssl-utils: remove
block and key sizes from cipher suites table"), -Wpointer-sign,
-Wunreachable-code-break.
Change-Id: I37ca5e9effe5d6560d49ccef53e9feb096cd2ad6
Reviewed-on: https://code.wireshark.org/review/17727
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Diffstat (limited to 'epan')
| -rw-r--r-- | epan/dissectors/packet-ssl-utils.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/epan/dissectors/packet-ssl-utils.c b/epan/dissectors/packet-ssl-utils.c index 51efa98a95..9027079842 100644 --- a/epan/dissectors/packet-ssl-utils.c +++ b/epan/dissectors/packet-ssl-utils.c @@ -1207,7 +1207,7 @@ const value_string tls_cert_status_type[] = { /* string_string is inappropriate as it compares strings while * "byte strings MUST NOT be truncated" (RFC 7301) */ typedef struct ssl_alpn_protocol { - const guint8 *proto_name; + const char *proto_name; size_t proto_name_len; const char *dissector_name; } ssl_alpn_protocol_t; @@ -4060,7 +4060,6 @@ ssl_load_pkcs12(FILE* fp, const gchar *cert_passwd, char** err) { /* Private key found, return it. */ priv_key = ssl_pkey; goto done; - break; default: ; } |