Align ASN.1 file with ETSI Forge ITS ASN.1 repository

asn1/Makefile

@@ -8,8 +8,8 @@
 # The name of the library
 ASN_LIBRARY = libItsAsn.so 
 # ASN.1 files to be included in the library
-ASN_FILES = CAM/CAM.asn \
-            DENM/DENM.asn \
+ASN_FILES = CAM/CAM_PDU_Descriptions.asn \
+            DENM/DENM_PDU_Descriptions.asn \
             IS/ETSI_TS_103301/IVIM_PDU_Descriptions.asn \
             IS/ETSI_TS_103301/MAPEM_PDU_Descriptions.asn \
             IS/ETSI_TS_103301/RTCM_PDU_Descriptions.asn \

scripts/update_its_project.bash

@@ -353,6 +353,13 @@ find ${PATH_DEV_ITS} -name "*.bash" -type f -exec chmod 775 {} \;
 find ${PATH_DEV_ITS} -type d -exec chmod 775 {} \;
 chown -R ${CHOWN_USER_GROUP} ${PATH_DEV_ITS}
 
+# Rename ASN.1 files containing '-' with '_' due to TITAN asn2ttcn tool
+mv ${PATH_DEV_ITS}/ttcn/LibIts/asn1/CAM/CAM-PDU-Descriptions.asn ${PATH_DEV_ITS}/ttcn/LibIts/asn1/CAM/CAM_PDU_Descriptions.asn
+mv ${PATH_DEV_ITS}/ttcn/LibIts/asn1/DENM/DENM-PDU-Descriptions.asn ${PATH_DEV_ITS}/ttcn/LibIts/asn1/DENM/DENM_PDU_Descriptions.asn
+mv ${PATH_DEV_ITS}/ttcn/LibIts/asn1/EVCSN/EVCSN-PDU-Descriptions.asn ${PATH_DEV_ITS}/ttcn/LibIts/asn1/EVCSN/EVCSN_PDU_Descriptions.asn
+mv ${PATH_DEV_ITS}/ttcn/LibIts/asn1/EV-RSR/EV-RSR-PDU-Descriptions.asn ${PATH_DEV_ITS}/ttcn/LibIts/asn1/EV-RSR/EV_RSR_PDU_Descriptions.asn
+mv ${PATH_DEV_ITS}/ttcn/LibIts/asn1/ITS-Container/ITS-Container.asn ${PATH_DEV_ITS}/ttcn/LibIts/asn1/ITS-Container/ITS_Container.asn
+mv ${PATH_DEV_ITS}/ttcn/LibIts/asn1/Security/TS102921/MessagesItss-OptionalPrivacy.asn ${PATH_DEV_ITS}/ttcn/LibIts/asn1/Security/TS102921/MessagesItss_OptionalPrivacy.asn
 # Build libAsn1
 mkdir ${PATH_DEV_ITS}/bin/asn1
 cd ${PATH_DEV_ITS}/bin/asn1
@@ -361,6 +368,7 @@ make CC=gcc -f ${PATH_DEV_ITS}/asn1/Makefile
 rm -fr ${PATH_DEV_ITS}/ttcn/LibIts/asn1/IS/ISO_TS_19091/original
 rm -f ${PATH_DEV_ITS}/ttcn/LibIts/asn1/Security/TS102921/EtsiTs102941MessagesItss.asn
 rm -f ${PATH_DEV_ITS}/ttcn/LibIts/asn1/Security/TS102921/MessagesItss_OptionalPrivacy.asn
+
 cd -
 if [ ! -d ${PATH_DEV_ITS}/include/asn1 ]
 then

LibIts @ f69ead2f

-Subproject commit 5d19fb4603b8895d36b6fd2531a9a957790ade2b
+Subproject commit f69ead2f16d5befcb8bbe43591d7697391731b34