Update definitions from ETSI TS 102 965 v3

Change-Id: Id51e46795fea3f20421ff94346e501bcf2af17b8
Reviewed-on: https://code.wireshark.org/review/31183
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>

2 files changed, 33 insertions, 15 deletions

diff --git a/epan/dissectors/asn1/its/packet-its-template.c b/epan/dissectors/asn1/its/packet-its-template.c
index ff5f102a7f..3fce883c66 100644
--- a/epan/dissectors/asn1/its/packet-its-template.c
+++ b/epan/dissectors/asn1/its/packet-its-template.c
@@ -98,9 +98,14 @@
 #define ITS_WKP_CRL        2015
 #define ITS_WKP_CERTIF_REQ 2016
 
-// ETSI TS 102 965 (V1.2.1)
-#define AID_CAM 36
-#define AID_DENM 37
+// ETSI TS 102 965 (V1.3.1)
+#define AID_CA       36
+#define AID_DEN      37
+#define AID_TLM     137
+#define AID_RLT     138
+#define AID_IVI     139
+#define AID_TLC     140
+#define AID_GN_MGMT 141
 
 /*
  * Prototypes
@@ -414,8 +419,12 @@ void proto_reg_handoff_its(void)
 
     dissector_add_uint("geonw.sec.v1.msg_type", ITS_DENM, its_handle_);
     dissector_add_uint("geonw.sec.v1.msg_type", ITS_CAM, its_handle_);
-    dissector_add_uint("geonw.sec.v2.app_id", AID_DENM, its_handle_);
-    dissector_add_uint("geonw.sec.v2.app_id", AID_CAM, its_handle_);
+    dissector_add_uint("geonw.sec.v2.app_id", AID_DEN, its_handle_);
+    dissector_add_uint("geonw.sec.v2.app_id", AID_CA, its_handle_);
+    dissector_add_uint("geonw.sec.v2.app_id", AID_TLM, its_handle_);
+    dissector_add_uint("geonw.sec.v2.app_id", AID_RLT, its_handle_);
+    dissector_add_uint("geonw.sec.v2.app_id", AID_IVI, its_handle_);
+    dissector_add_uint("geonw.sec.v2.app_id", AID_TLC, its_handle_);
 
     dissector_add_uint("its.msg_id", ITS_DENM,              create_dissector_handle( dissect_denm_DecentralizedEnvironmentalNotificationMessage_PDU, proto_its_denm ));
     dissector_add_uint("its.msg_id", ITS_CAM,               create_dissector_handle( dissect_cam_CoopAwareness_PDU, proto_its_cam ));
diff --git a/epan/dissectors/packet-its.c b/epan/dissectors/packet-its.c
index d498254d3b..6a6fdf943b 100644
--- a/epan/dissectors/packet-its.c
+++ b/epan/dissectors/packet-its.c
@@ -106,9 +106,14 @@
 #define ITS_WKP_CRL        2015
 #define ITS_WKP_CERTIF_REQ 2016
 
-// ETSI TS 102 965 (V1.2.1)
-#define AID_CAM 36
-#define AID_DENM 37
+// ETSI TS 102 965 (V1.3.1)
+#define AID_CA       36
+#define AID_DEN      37
+#define AID_TLM     137
+#define AID_RLT     138
+#define AID_IVI     139
+#define AID_TLC     140
+#define AID_GN_MGMT 141
 
 /*
  * Prototypes
@@ -1265,7 +1270,7 @@ static int hf_evrsr_SupportedPaymentTypes_contract = -1;
 static int hf_evrsr_SupportedPaymentTypes_externalIdentification = -1;
 
 /*--- End of included file: packet-its-hf.c ---*/
-#line 151 "./asn1/its/packet-its-template.c"
+#line 156 "./asn1/its/packet-its-template.c"
 
 // CauseCode/SubCauseCode management
 static int hf_its_trafficConditionSubCauseCode = -1;
@@ -1707,7 +1712,7 @@ static gint ett_evrsr_RechargingType = -1;
 static gint ett_evrsr_SupportedPaymentTypes = -1;
 
 /*--- End of included file: packet-its-ett.c ---*/
-#line 181 "./asn1/its/packet-its-template.c"
+#line 186 "./asn1/its/packet-its-template.c"
 
 // Deal with cause/subcause code management
 struct { CauseCodeType_enum cause; int* hf; } cause_to_subcause[] = {
@@ -12810,7 +12815,7 @@ static int dissect_evrsr_EV_RSR_MessageBody_PDU(tvbuff_t *tvb _U_, packet_info *
 
 
 /*--- End of included file: packet-its-fn.c ---*/
-#line 223 "./asn1/its/packet-its-template.c"
+#line 228 "./asn1/its/packet-its-template.c"
 
 static int
 dissect_its_PDU(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data)
@@ -17139,7 +17144,7 @@ void proto_register_its(void)
         NULL, HFILL }},
 
 /*--- End of included file: packet-its-hfarr.c ---*/
-#line 259 "./asn1/its/packet-its-template.c"
+#line 264 "./asn1/its/packet-its-template.c"
 
     { &hf_its_roadworksSubCauseCode,
       { "roadworksSubCauseCode", "its.subCauseCode",
@@ -17653,7 +17658,7 @@ void proto_register_its(void)
     &ett_evrsr_SupportedPaymentTypes,
 
 /*--- End of included file: packet-its-ettarr.c ---*/
-#line 361 "./asn1/its/packet-its-template.c"
+#line 366 "./asn1/its/packet-its-template.c"
     };
 
     proto_its = proto_register_protocol("Intelligent Transport Systems", "ITS", "its");
@@ -17710,8 +17715,12 @@ void proto_reg_handoff_its(void)
 
     dissector_add_uint("geonw.sec.v1.msg_type", ITS_DENM, its_handle_);
     dissector_add_uint("geonw.sec.v1.msg_type", ITS_CAM, its_handle_);
-    dissector_add_uint("geonw.sec.v2.app_id", AID_DENM, its_handle_);
-    dissector_add_uint("geonw.sec.v2.app_id", AID_CAM, its_handle_);
+    dissector_add_uint("geonw.sec.v2.app_id", AID_DEN, its_handle_);
+    dissector_add_uint("geonw.sec.v2.app_id", AID_CA, its_handle_);
+    dissector_add_uint("geonw.sec.v2.app_id", AID_TLM, its_handle_);
+    dissector_add_uint("geonw.sec.v2.app_id", AID_RLT, its_handle_);
+    dissector_add_uint("geonw.sec.v2.app_id", AID_IVI, its_handle_);
+    dissector_add_uint("geonw.sec.v2.app_id", AID_TLC, its_handle_);
 
     dissector_add_uint("its.msg_id", ITS_DENM,              create_dissector_handle( dissect_denm_DecentralizedEnvironmentalNotificationMessage_PDU, proto_its_denm ));
     dissector_add_uint("its.msg_id", ITS_CAM,               create_dissector_handle( dissect_cam_CoopAwareness_PDU, proto_its_cam ));