diff options
| author | J M <jm.commercial@posteo.de> | 2021-07-15 06:40:22 +0000 |
|---|---|---|
| committer | Wireshark GitLab Utility <6629907-ws-gitlab-utility@users.noreply.gitlab.com> | 2021-07-15 06:40:22 +0000 |
| commit | cbed7130ded4074952baf29a7c2dca1278b62edc (patch) | |
| tree | fd3601327f525b09ac02b3a621b1953403e9f6f1 | |
| parent | 0a9ef601d201f87ff3effb8aca62c61184fd6146 (diff) | |
DoIP: Add TLS handover for encrypted communication
| -rw-r--r-- | epan/dissectors/packet-doip.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/epan/dissectors/packet-doip.c b/epan/dissectors/packet-doip.c index 01ec6c48ae..1dce4401d4 100644 --- a/epan/dissectors/packet-doip.c +++ b/epan/dissectors/packet-doip.c @@ -24,6 +24,7 @@ #include <epan/packet.h> #include <epan/uat.h> #include <epan/dissectors/packet-tcp.h> +#include <epan/dissectors/packet-tls.h> void proto_register_doip(void); void proto_reg_handoff_doip(void); @@ -31,7 +32,7 @@ void proto_reg_handoff_doip(void); #define DOIP_PORT 13400 - +#define DOIP_TLS_PORT 3496 #define DOIP_GENERIC_NACK 0x0000 #define DOIP_VEHICLE_IDENTIFICATION_REQ 0x0001 @@ -235,7 +236,7 @@ static const value_string activation_codes[] = { { 0x04, "Routing activation denied due to missing authentication." }, { 0x05, "Routing activation denied due to rejected confirmation." }, { 0x06, "Routing activation denied due to unsupported routing activation type." }, - { 0x07, "Reserved by ISO 13400." }, + { 0x07, "Routing activation denied due to request for encrypted connection via TLS." }, { 0x08, "Reserved by ISO 13400." }, { 0x09, "Reserved by ISO 13400." }, { 0x0A, "Reserved by ISO 13400." }, @@ -1151,6 +1152,8 @@ proto_reg_handoff_doip(void) dissector_add_uint("udp.port", DOIP_PORT, doip_handle); dissector_add_uint("tcp.port", DOIP_PORT, doip_handle); + ssl_dissector_add( DOIP_TLS_PORT, doip_handle); + uds_handle = find_dissector("uds"); } |