From 7c753702242dff9f73a960911907120203196248 Mon Sep 17 00:00:00 2001 From: Peter Wu Date: Tue, 30 Aug 2016 00:10:50 +0200 Subject: ssl: fix wrong detection of non-resumed renegotiated session If the heuristics fail to detect a resumed session, then it must mark the session as a normal session. This will also prevent from applying secrets that do not apply to this renegotiated session. Bug: 12793 Change-Id: I90f794a7bbaf7f1839e39656ac318183ecf48887 Reviewed-on: https://code.wireshark.org/review/17376 Petri-Dish: Peter Wu Tested-by: Petri Dish Buildbot Reviewed-by: Alexis La Goutte Reviewed-by: Anders Broman --- epan/dissectors/packet-ssl-utils.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/epan/dissectors/packet-ssl-utils.c b/epan/dissectors/packet-ssl-utils.c index 62acd7e29a..b57065593e 100644 --- a/epan/dissectors/packet-ssl-utils.c +++ b/epan/dissectors/packet-ssl-utils.c @@ -5091,9 +5091,11 @@ ssl_dissect_change_cipher_spec(ssl_common_dissect_t *hf, tvbuff_t *tvb, } else { /* Can happen if the capture somehow starts in the middle */ ssl_debug_printf("%s No Session resumption, missing packets?\n", G_STRFUNC); + session->is_session_resumed = FALSE; } } else { ssl_debug_printf("%s Not using Session resumption\n", G_STRFUNC); + session->is_session_resumed = FALSE; } } if (is_from_server && session->is_session_resumed) -- cgit v1.2.3