aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeter Wu <peter@lekensteyn.nl>2016-08-30 00:10:50 +0200
committerAnders Broman <a.broman58@gmail.com>2016-08-30 08:15:14 +0000
commit7c753702242dff9f73a960911907120203196248 (patch)
treec92abed9346a1e006e1b95fa70bb07229f79b9e9
parentcbd3648738de7adab294d48043d0ac5bc76f07bc (diff)
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 <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
-rw-r--r--epan/dissectors/packet-ssl-utils.c2
1 files changed, 2 insertions, 0 deletions
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)