Commit 6b5823d3 authored by Denis Filatov's avatar Denis Filatov
Browse files

synch devel branch with recent changes in ASN.1 files

parent a51d60e2

asn1/Makefile

+29 −32
Original line number Diff line number Diff line
@@ -8,13 +8,37 @@ 
# The name of the library

ASN_LIBRARY = libItsAsn.a

# ASN.1 files to be included in the library

ASN_FILES = AtsCAM/lib/asn1/CAM_PDU_Descriptions.asn                            \

            AtsCAM/lib/asn1/cdd/ITS_Container.asn                               \

            AtsDENM/lib/asn1/DENM_PDU_Descriptions.asn                          \

ASN_FILES = \

            AtsMBR/lib/asn1/EtsiTs103759AsrAppAgnostic.asn                      \

            AtsMBR/lib/asn1/EtsiTs103759AsrCam.asn                              \

            AtsMBR/lib/asn1/EtsiTs103759AsrDenm.asn                             \

            AtsMBR/lib/asn1/EtsiTs103759BaseTypes.asn                           \

            AtsMBR/lib/asn1/EtsiTs103759CommonObservations.asn                  \

            AtsMBR/lib/asn1/EtsiTs103759Core.asn                                \

            AtsMBR/lib/asn1/SaeJ3287AsrBsm.asn                                  \

            AtsSecurity/lib/asn1/EtsiTs103097ExtensionModule.asn                \

            AtsSecurity/lib/asn1/EtsiTs103097Module.asn                         \

            AtsSecurity/lib/asn1/ieee1609dot2/Ieee1609Dot2.asn                  \

            AtsSecurity/lib/asn1/ieee1609dot2/Ieee1609Dot2BaseTypes.asn         \

            AtsSecurity/lib/asn1/ieee1609dot2/IEEE1609dot2BaseTypes.asn         \

            AtsSecurity/lib/asn1/ieee1609dot2/IEEE1609dot2.asn                  \

            AtsPki/lib/asn1/ieee_1609.2.1/ieee1609dot2/Ieee1609Dot2Crl.asn      \

            AtsPki/lib/asn1/ieee_1609.2.1/ieee1609dot2/Ieee1609Dot2CrlBaseTypes.asn \

            AtsPki/lib/asn1/ieee_1609.2.1/Ieee1609Dot2Dot1AcaEeInterface.asn    \

            AtsPki/lib/asn1/ieee_1609.2.1/Ieee1609Dot2Dot1AcaLaInterface.asn    \

            AtsPki/lib/asn1/ieee_1609.2.1/Ieee1609Dot2Dot1AcaMaInterface.asn    \

            AtsPki/lib/asn1/ieee_1609.2.1/Ieee1609Dot2Dot1AcaRaInterface.asn    \

            AtsPki/lib/asn1/ieee_1609.2.1/Ieee1609Dot2Dot1Acpc.asn              \

            AtsPki/lib/asn1/ieee_1609.2.1/Ieee1609Dot2Dot1CamRaInterface.asn    \

            AtsPki/lib/asn1/ieee_1609.2.1/Ieee1609Dot2Dot1CertManagement.asn    \

            AtsPki/lib/asn1/ieee_1609.2.1/Ieee1609Dot2Dot1EcaEeInterface.asn    \

            AtsPki/lib/asn1/ieee_1609.2.1/Ieee1609Dot2Dot1EeMaInterface.asn     \

            AtsPki/lib/asn1/ieee_1609.2.1/Ieee1609Dot2Dot1EeRaInterface.asn     \

            AtsPki/lib/asn1/ieee_1609.2.1/Ieee1609Dot2Dot1LaMaInterface.asn     \

            AtsPki/lib/asn1/ieee_1609.2.1/Ieee1609Dot2Dot1LaRaInterface.asn     \

            AtsPki/lib/asn1/ieee_1609.2.1/Ieee1609Dot2Dot1MaRaInterface.asn     \

            AtsPki/lib/asn1/ieee_1609.2.1/Ieee1609Dot2Dot1Protocol.asn          \

            AtsCAM/lib/asn1/CAM_PDU_Descriptions.asn                            \

            AtsCAM/lib/asn1/cdd/ITS_Container.asn                               \

            AtsDENM/lib/asn1/DENM_PDU_Descriptions.asn                          \

            AtsIS/lib/asn1/IVIM_PDU_Descriptions.asn                            \

            AtsIS/lib/asn1/MAPEM_PDU_Descriptions.asn                           \

            AtsIS/lib/asn1/RTCMEM_PDU_Descriptions.asn                          \
@@ -33,33 +57,6 @@ ASN_FILES = AtsCAM/lib/asn1/CAM_PDU_Descriptions.asn 
            ../build/asn1/ISO_TS_14816/AVIAEINumberingAndDataStructures.asn     \

            ../build/asn1/ISO_TS_17419/CITSapplMgmtIDs.asn                      \

            ../build/asn1/ISO_TS_19321/IVI.asn                                  \

            AtsPki/lib/asn1/ieee_1609.2.1/Ieee1609Dot2Crl.asn                   \

            AtsPki/lib/asn1/ieee_1609.2.1/Ieee1609Dot2CrlBaseTypes.asn          \

            AtsPki/lib/asn1/ieee_1609.2.1/Ieee1609Dot2Dot1AcaEeInterface.asn    \

            AtsPki/lib/asn1/ieee_1609.2.1/Ieee1609Dot2Dot1AcaLaInterface.asn    \

            AtsPki/lib/asn1/ieee_1609.2.1/Ieee1609Dot2Dot1AcaMaInterface.asn    \

            AtsPki/lib/asn1/ieee_1609.2.1/Ieee1609Dot2Dot1AcaRaInterface.asn    \

            AtsPki/lib/asn1/ieee_1609.2.1/Ieee1609Dot2Dot1Acpc.asn              \

            AtsPki/lib/asn1/ieee_1609.2.1/Ieee1609Dot2Dot1CamRaInterface.asn    \

            AtsPki/lib/asn1/ieee_1609.2.1/Ieee1609Dot2Dot1CertManagement.asn    \

            AtsPki/lib/asn1/ieee_1609.2.1/Ieee1609Dot2Dot1EcaEeInterface.asn    \

            AtsPki/lib/asn1/ieee_1609.2.1/Ieee1609Dot2Dot1EeMaInterface.asn     \

            AtsPki/lib/asn1/ieee_1609.2.1/Ieee1609Dot2Dot1EeRaInterface.asn     \

            AtsPki/lib/asn1/ieee_1609.2.1/Ieee1609Dot2Dot1LaMaInterface.asn     \

            AtsPki/lib/asn1/ieee_1609.2.1/Ieee1609Dot2Dot1LaRaInterface.asn     \

            AtsPki/lib/asn1/ieee_1609.2.1/Ieee1609Dot2Dot1MaRaInterface.asn     \

            AtsPki/lib/asn1/ieee_1609.2.1/Ieee1609Dot2Dot1Protocol.asn          \

            AtsMBR/lib/asn1/EtsiTs103759Core.asn                                \

            AtsMBR/lib/asn1/EtsiTs103759BaseTypes.asn                           \

            AtsMBR/lib/asn1/EtsiTs103759AsrAppAgnostic.asn                      \

            AtsMBR/lib/asn1/EtsiTs103759AsrCam.asn                              \

            AtsMBR/lib/asn1/EtsiTs103759AsrDenm.asn                             \

            AtsMBR/lib/asn1/EtsiTs103759CommonObservations.asn                  \

            AtsMBR/lib/asn1/SaeJ3287AsrBsm.asn                                  \

            AtsMBR/lib/asn1/ieee1609.2/Ieee1609Dot2BaseTypes.asn                \

            AtsMBR/lib/asn1/ieee1609.2/Ieee1609Dot2.asn                         \

            AtsMBR/lib/asn1/ieee1609.2/Ieee1609Dot2CrlBaseTypes.asn             \

            AtsMBR/lib/asn1/ieee1609.2/Ieee1609Dot2Crl.asn                      \





# PDUs

config.mk

+6 −4
Original line number Diff line number Diff line 
TTCN3_DIR      := $(HOME)/frameworks/titan/titan.core/Install

ASN1C_PATH     := $(HOME)/frameworks/asn1c.denis

#WPCAP_DLL_PATH := /cygdrive/c/windows/system32/npcap/wpcap.dll

#NPCAP_INCLUDE  := /cygdrive/c/PROGRA~1/Npcap/sdk/include

#TTCN3_DIR      := $(HOME)/frameworks/titan/titan.core/Install

#ASN1C_PATH     := $(HOME)/frameworks/asn1c.denis

TTCN3_DIR      := /cygdrive/c/Tools/titan

ASN1C_PATH     := ../../../asn1c-fillabs

WPCAP_DLL_PATH := /cygdrive/c/windows/system32/npcap/wpcap.dll

NPCAP_INCLUDE  := /cygdrive/c/PROGRA~1/Npcap/sdk/include

#T3Q_PATH=./tools/t3q-v2.0.0b30

#T3Q_CONFIG=t3q.cfg

#T3D_PATH=./tools/t3d-v2.0.0b30

titan-test-system-framework @ b3e32ae4

Original line number Diff line number Diff line 
Subproject commit 07e483b6f5f83ea55de07fe84eaa924c7f401724
 
Subproject commit b3e32ae45e559819ba3eab8ba748a03ff6fdd284

AtsCAM @ 84fbaff0

Compare 601c6de4 to 84fbaff0
Original line number Diff line number Diff line 
Subproject commit 601c6de4b529cfcced4abc07a1dbb0b52d4855f8
 
Subproject commit 84fbaff028a63884f5db2074d0ace729be39265f

AtsMBR @ b9a8374a

Compare 52a990bc to b9a8374a
Original line number Diff line number Diff line 
Subproject commit 52a990bcf0047375129ffc75d67714fed77645a1
 
Subproject commit b9a8374ae0a4022cd5c785955ac333a02868fa8a