aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-dtls.c
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2014-04-26 11:40:49 +0200
committerEvan Huus <eapache@gmail.com>2014-04-26 15:47:47 +0000
commit3b76de7dc29c1b42eb5e91ee130e611c25195ac9 (patch)
tree7844b6d884db05e9b5414f23ccd6ee819a026b25 /epan/dissectors/packet-dtls.c
parent720f504dd61c365a88f5745b1b5656eb1098475d (diff)
dtls: run dissector for decryption also on server hello extensions
The dissector only ran through the server hello extensions for the tree and not in the ssl decryption pass. This resulted in ssl_dissect_hnd_hello_ext() being always called with ssl == NULL. For SSL this was also called with ssl != NULL. Change-Id: I22f7b1089731124b3ca1a2b8515f307c4a021b7f Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> Reviewed-on: https://code.wireshark.org/review/1370 Reviewed-by: Evan Huus <eapache@gmail.com>
Diffstat (limited to 'epan/dissectors/packet-dtls.c')
-rw-r--r--epan/dissectors/packet-dtls.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/epan/dissectors/packet-dtls.c b/epan/dissectors/packet-dtls.c
index 24c93b949d..20d2219f7c 100644
--- a/epan/dissectors/packet-dtls.c
+++ b/epan/dissectors/packet-dtls.c
@@ -1935,8 +1935,6 @@ dissect_dtls_hnd_srv_hello(tvbuff_t *tvb,
/* store selected compression method for decompression */
ssl->compression = tvb_get_guint8(tvb, offset+2);
}
- if (!tree)
- return offset;
/* now the server-selected cipher suite */
proto_tree_add_item(tree, hf_dtls_handshake_cipher_suite,