From 0c382106f8504315039510e4adc67e0e5c2003cd Mon Sep 17 00:00:00 2001 From: Helmut Buchsbaum Date: Fri, 10 Nov 2017 12:13:05 +0100 Subject: [PATCH] dissector/amqp: fix TLS/SSL payload dissection To enable TLS/SSL payload dissection for AMQPS traffic add the AMQP handle as SSL dissector for the actual AMQPS port. Thus we have successfully decrypted our AMQPS traffic using a pre-master-key file. Change-Id: I63dec2217fb5645007da010f651846834abacdbc Reviewed-on: https://code.wireshark.org/review/24335 Reviewed-by: Anders Broman Petri-Dish: Anders Broman Reviewed-by: Michael Mann --- epan/dissectors/packet-amqp.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/epan/dissectors/packet-amqp.c b/epan/dissectors/packet-amqp.c index 06fe55f51a..060b0fc492 100644 --- a/epan/dissectors/packet-amqp.c +++ b/epan/dissectors/packet-amqp.c @@ -13440,8 +13440,11 @@ proto_reg_handoff_amqp(void) } /* Register for TLS/SSL payload dissection */ - if (old_amqps_port != 0 && old_amqps_port != amqps_port){ - ssl_dissector_delete(old_amqps_port, amqp_tcp_handle); + if (old_amqps_port != amqps_port) { + if (old_amqps_port != 0) + ssl_dissector_delete(old_amqps_port, amqp_tcp_handle); + ssl_dissector_add(amqps_port, amqp_tcp_handle); + old_amqps_port = amqps_port; } }