diff options
| author | Guy Harris <guy@alum.mit.edu> | 2014-01-14 05:47:50 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2014-01-14 05:47:50 +0000 |
| commit | 4a7636a6f83c83dfeab4392b3a2863a957117c98 (patch) | |
| tree | 8ec6cd0d2aabefd91c1f697a226c136d5391a763 | |
| parent | c6c1887a0b9a028802826243fc61e8669f28f37e (diff) | |
Don't cast away constness.
svn path=/trunk/; revision=54768
| -rw-r--r-- | epan/dissectors/packet-ssl-utils.c | 2 | ||||
| -rw-r--r-- | epan/dissectors/packet-ssl.c | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/epan/dissectors/packet-ssl-utils.c b/epan/dissectors/packet-ssl-utils.c index bb04e00ee6..240839c529 100644 --- a/epan/dissectors/packet-ssl-utils.c +++ b/epan/dissectors/packet-ssl-utils.c @@ -3826,7 +3826,7 @@ ssl_association_remove(GTree* associations, SslAssociation *assoc) gint ssl_association_cmp(gconstpointer a, gconstpointer b) { - const SslAssociation *assoc_a=(SslAssociation *)a, *assoc_b=(SslAssociation *)b; + const SslAssociation *assoc_a=(const SslAssociation *)a, *assoc_b=(const SslAssociation *)b; if (assoc_a->tcp != assoc_b->tcp) return (assoc_a->tcp)?1:-1; return assoc_a->ssl_port - assoc_b->ssl_port; } diff --git a/epan/dissectors/packet-ssl.c b/epan/dissectors/packet-ssl.c index 5e1281aa1f..290f237b35 100644 --- a/epan/dissectors/packet-ssl.c +++ b/epan/dissectors/packet-ssl.c @@ -906,7 +906,7 @@ decrypt_ssl3_record(tvbuff_t *tvb, packet_info *pinfo, guint32 offset, /* save data to update IV if decoder is available or updated later */ data_for_iv = (direction != 0) ? &ssl->server_data_for_iv : &ssl->client_data_for_iv; data_for_iv_len = (record_length < 24) ? record_length : 24; - ssl_data_set(data_for_iv, (guchar*)tvb_get_ptr(tvb, offset + record_length - data_for_iv_len, data_for_iv_len), data_for_iv_len); + ssl_data_set(data_for_iv, (const guchar*)tvb_get_ptr(tvb, offset + record_length - data_for_iv_len, data_for_iv_len), data_for_iv_len); if (!decoder) { ssl_debug_printf("decrypt_ssl3_record: no decoder available\n"); @@ -925,7 +925,7 @@ decrypt_ssl3_record(tvbuff_t *tvb, packet_info *pinfo, guint32 offset, /* save data to update IV if valid session key is obtained later */ data_for_iv = (direction != 0) ? &ssl->server_data_for_iv : &ssl->client_data_for_iv; data_for_iv_len = (record_length < 24) ? record_length : 24; - ssl_data_set(data_for_iv, (guchar*)tvb_get_ptr(tvb, offset + record_length - data_for_iv_len, data_for_iv_len), data_for_iv_len); + ssl_data_set(data_for_iv, (const guchar*)tvb_get_ptr(tvb, offset + record_length - data_for_iv_len, data_for_iv_len), data_for_iv_len); } if (ret && save_plaintext) { ssl_add_data_info(proto_ssl, pinfo, ssl_decrypted_data.data, ssl_decrypted_data_avail, tvb_raw_offset(tvb)+offset, decoder->flow); @@ -4784,7 +4784,7 @@ ssldecrypt_free_cb(void *r) static void* ssldecrypt_copy_cb(void *dest, const void *orig, size_t len _U_) { - const ssldecrypt_assoc_t *o = (ssldecrypt_assoc_t *)orig; + const ssldecrypt_assoc_t *o = (const ssldecrypt_assoc_t *)orig; ssldecrypt_assoc_t *d = (ssldecrypt_assoc_t *)dest; d->ipaddr = g_strdup(o->ipaddr); |