osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

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 <a.broman58@gmail.com>
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
This commit is contained in:
Helmut Buchsbaum 2017-11-10 12:13:05 +01:00 committed by Michael Mann
parent 6ef9538770
commit 0c382106f8
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
epan/dissectors/packet-amqp.c
View File

@ -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;
}
}