Commit 5d39aeb9 authored by YannGarcia's avatar YannGarcia

Merge branch 'STF525' of https://forge.etsi.org/gitlab/ITS/ITS into STF525

parents 11b20e3a a3075fe4
......@@ -91,20 +91,18 @@ LogEventTypes:= Yes
# time_offset : Time offset, used to skip packets with time offset < time_offset
# save_mode : Set to 1 to save sent packet, 0 otherwise
#system.camPort.params := "CAM(next_header=btpB,header_type=tsb,header_sub_type=sh)/BTP/GN(ll_address=4C5E0C14D2EA,latitude=43551050,longitude=10298730,distanceA=1500,distanceB=1500,angle=0,device_mode=1,secured_mode=1,sec_db_path=/home/vagrant/tmp/asn1c_cert)/ETH(mac_src=e2b7b30429eb)/PCAP(mac_src=e2b7b30429eb,nic=eth2,filter=and ether proto 0x8947)"
system.camPort.params := "CAM(next_header=btpB,header_type=tsb,header_sub_type=sh)/BTP/GN(ll_address=4C5E0C14D2EA,latitude=43551050,longitude=10298730,distanceA=1500,distanceB=1500,angle=0,device_mode=1,secured_mode=1,sec_db_path=/home/vagrant/tmp/asn1c_cert)/ETH(mac_src=e2b7b30429eb)/PCAP(mac_src=e2b7b30429eb,nic=wlan0,filter=and ether proto 0x8947)"
#system.camPort.params := "CAM(next_header=btpB,header_type=tsb,header_sub_type=sh)/BTP/GN(ll_address=4C5E0C14D2EA,latitude=43551050,longitude=10298730,distanceA=1500,distanceB=1500,angle=0,device_mode=1)/ETH(mac_src=e2b7b30429eb)/PCAP(mac_src=e2b7b30429eb,nic=tap0,filter=and ether proto 0x8947)" # Nordsys non secured
#system.camPort.params := "CAM(next_header=btpB,header_type=tsb,header_sub_type=sh)/BTP/GN(ll_address=4C5E0C14D2EA,latitude=43551050,longitude=10298730,distanceA=1500,distanceB=1500,angle=0,device_mode=1,secured_mode=1,sec_db_path=/home/vagrant/tmp/asn1c_cert)/ETH(mac_src=e2b7b30429eb)/PCAP(mac_src=e2b7b30429eb,nic=tap0,filter=and ether proto 0x8947)" # Nordsys secured
#system.camPort.params := "CAM(next_header=btpB,header_type=tsb,header_sub_type=sh)/BTP/GN(ll_address=4C5E0C14D2EA,latitude=43551050,longitude=10298730,distanceA=1500,distanceB=1500,angle=0,device_mode=1,secured_mode=0,sec_db_path=/home/vagrant/tmp/asn1c_cert)/UDP(dst_ip=172.28.7.123,src_port=54915,dst_port=54915)" # Savary
system.camPort.params := "CAM(next_header=btpB,header_type=tsb,header_sub_type=sh)/BTP/GN(ll_address=4C5E0C14D2EA,latitude=43551050,longitude=10298730,distanceA=1500,distanceB=1500,angle=0,device_mode=1,secured_mode=0,sec_db_path=/home/vagrant/tmp/asn1c_cert)/COMMSIGNIA(mac_src=080027F44E7D,interface_id=2,target_host=192.168.42.2)/UDP(dst_ip=192.168.42.2,src_port=7943,dst_port=6666)"
#system.camPort.params := "CAM(next_header=btpB,header_type=tsb,header_sub_type=sh)/BTP/GN(ll_address=4C5E0C14D2EA,latitude=43551050,longitude=10298730,distanceA=1500,distanceB=1500,angle=0,device_mode=1,secured_mode=0,sec_db_path=/home/vagrant/tmp/asn1c_cert)/COMMSIGNIA(mac_src=080027F44E7D,interface_id=2,target_host=192.168.42.2)/UDP(dst_ip=192.168.42.2,src_port=7943,dst_port=6666)"
# CAM UpperTester port based on UDP
system.utPort.params := "UT_CAM/UDP(dst_ip=192.168.1.250,src_port=12345)"
#system.utPort.params := "UT_CAM/UDP(dst_ip=172.23.0.1,dst_port=8000)" # Nordsys
#system.utPort.params := "UT_CAM/UDP(dst_ip=172.28.7.123,dst_port=1999)" # Savary
system.utPort.params := "UT_CAM/UDP(dst_ip=192.168.1.252,src_port=12345)"
[EXECUTE]
#ItsCam_TestCases.TC_CAM_MSD_FMT_BV_01
ItsCam_TestCases.TC_CAM_MSD_FMT_BV_01
#ItsCam_TestCases.TC_CAM_MSD_FMT_BV_02
#ItsCam_TestCases.TC_CAM_MSD_FMT_BV_03
#ItsCam_TestCases.TC_CAM_MSD_FMT_BV_04
......@@ -152,7 +150,7 @@ system.utPort.params := "UT_CAM/UDP(dst_ip=192.168.1.250,src_port=12345)"
#ItsCam_TestCases.TC_CAM_MSD_INA_BV_07
#ItsCam_TestCases.TC_CAM_MSD_INA_BV_08
#ItsCam_TestCases.TC_CAM_MSD_SSP_BO_02
ItsCam_TestCases.TC_CAM_MSP_BV_01
#ItsCam_TestCases.TC_CAM_MSP_BV_01
[MAIN_CONTROLLER]
# The options herein control the behavior of MC.
......
......@@ -6,6 +6,7 @@
LibItsCommon_Pixits.PX_IUT_STATION_ID := 2533729309
LibItsGeoNetworking_Pixits.PX_GN_UPPER_LAYER := e_btpB
LibItsDenm_Pics.PICS_IS_IUT_SECURED := true
[LOGGING]
# In this section you can specify the name of the log file and the classes of events
......@@ -87,19 +88,22 @@ LogEventTypes:= Yes
# time_offset : Time offset, used to skip packets with time offset < time_offset
# save_mode : Set to 1 to save sent packet, 0 otherwise
system.denmPort.params := "DENM(next_header=btpB,header_type=tsb)/BTP(dst_port=2002)/GN(ll_address=4C5E0C14D2EA,latitude=43551050,longitude=10298730,distanceA=1500,distanceB=1500,angle=0,device_mode=1)/ETH(mac_src=e2b7b30429eb)/PCAP(mac_src=e2b7b30429eb,nic=eth1,filter=and ether proto 0x8947)"
system.denmPort.params := "DENM(next_header=btpB,header_type=tsb)/BTP(dst_port=2002)/GN(ll_address=4C5E0C14D2EA,latitude=43551050,longitude=10298730,distanceA=1500,distanceB=1500,angle=0,device_mode=1,secured_mode=1,sec_db_path=/home/vagrant/tmp/asn1c_cert)/ETH(mac_src=e2b7b30429eb)/PCAP(mac_src=e2b7b30429eb,nic=wlan0,filter=and ether proto 0x8947)"
# DENM UpperTester port based on UDP (ETSI Wlan)
system.utPort.params := "UT_DENM/UDP(dst_ip=192.168.56.101)"
# DENM UpperTester port based on UDP
system.utPort.params := "UT_DENM/UDP(dst_ip=192.168.1.252,src_port=12345)"
[EXECUTE]
ItsDenm_TestCases.TC_DEN_MSGF_BV_01
#ItsDenm_TestCases.TC_DEN_MSGF_BV_01
#ItsDenm_TestCases.TC_DEN_MSGF_BV_02
#ItsDenm_TestCases.TC_DEN_EVGN_BV_01
#ItsDenm_TestCases.TC_DEN_EVGN_BV_02
#ItsDenm_TestCases.TC_DEN_EVGN_BV_03
#ItsDenm_TestCases.TC_DEN_EVGN_BV_04
#ItsDenm_TestCases.TC_DEN_EVUP_BV_01
#ItsDenm_TestCases.TC_DEN_EVUP_BO_04
#ItsDenm_TestCases.TC_DEN_EVTR_BV_01
ItsDenm_TestCases.TC_DEN_MSRV_BV_01
[MAIN_CONTROLLER]
# The options herein control the behavior of MC.
......
......@@ -4,10 +4,10 @@
# The GeoNetworking address of the IUT.
LibItsGeoNetworking_Pics.PICS_GN_LOCAL_GN_ADDR := {
typeOfAddress := e_initial, # e_manual(1)
typeOfAddress := e_manual, # e_initial
stationType := e_roadSideUnit,
stationCountryCode := 0, #33,
mid := '080027583433'O
stationCountryCode := 33,
mid := '001C6B0D0201'O
}
#LibItsGeoNetworking_Pics.PICS_GN_LOCAL_GN_ADDR := {
# typeOfAddress := e_initial,
......@@ -20,10 +20,13 @@ LibItsGeoNetworking_Pixits.PX_GN_UPPER_LAYER := e_btpB
LibItsBtp_Pixits.PX_DESTINATION_PORT := 2001
LibItsBtp_Pixits.PX_DESTINATION_PORT_INFO := 2001
# Use this certificate if the RSU simulator act as IUT
LibItsCommon_Pixits.PX_CERT_FOR_TS := "CERT_IUT_A_AT"
# Enable Security support
LibItsGeoNetworking_Pics.PICS_GN_SECURITY := true
# Root path to access certificate stored in files, identified by certficate ID
LibItsSecurity_Pixits.PX_CERTIFICATE_POOL_PATH := "/home/vagrant/tmp/test/certificates"
LibItsSecurity_Pixits.PX_CERTIFICATE_POOL_PATH := "/home/vagrant/tmp"
# Configuration sub-directory to access certificate stored in files
LibItsSecurity_Pixits.PX_IUT_SEC_CONFIG_NAME := "asn1c_cert"
......@@ -111,8 +114,10 @@ LogEventTypes:= Yes
# its_aid = 36 CAM
# its_aid = 37 DENM
# its_aid = 141 GeonNet mgnt
system.geoNetworkingPort.params := "GN(ll_address=4C5E0C14D2EB,latitude=43551050,longitude=10298730,distanceA=1500,distanceB=1500,angle=0,device_mode=0,secured_mode=0,its_aid=36)/ETH(mac_src=e2b7b30429eb)/PCAP(mac_src=e2b7b30429eb,nic=eth1,filter=and ether proto 0x8947)"
system.utPort.params := "UT_CAM/UDP(dst_ip=192.168.161.140)"
system.geoNetworkingPort.params := "GN(ll_address=4C5E0C14D2EB,latitude=43551050,longitude=10298730,distanceA=1500,distanceB=1500,angle=0,device_mode=0,secured_mode=0,its_aid=36)/ETH(mac_src=e2b7b30429eb)/PCAP(mac_src=e2b7b30429eb,nic=wlan0,filter=and ether proto 0x8947)"
system.utPort.params := "UT_CAM/UDP(dst_ip=192.168.1.252,src_port=12345)"
system.camUtPort.params := "UT_CAM/UDP(dst_ip=192.168.1.252,src_port=12345)"
[EXECUTE]
......@@ -147,7 +152,7 @@ system.utPort.params := "UT_CAM/UDP(dst_ip=192.168.161.140)"
# Check that IUT sends the secured CAM containing the signing certificate when the timeout of one second
# has been expired after the previous CAM containing the certificate.
#ItsSecurity_TestCases.TC_SEC_ITSS_SND_CAM_07_BV
ItsSecurity_TestCases.TC_SEC_ITSS_SND_CAM_07_BV
# Check that IUT sends the secured CAM containing the signing certificate when the IUT received CAM from an unknown ITS-S.
#ItsSecurity_TestCases.TC_SEC_ITSS_SND_CAM_08_BV
......@@ -244,7 +249,7 @@ system.utPort.params := "UT_CAM/UDP(dst_ip=192.168.161.140)"
#ItsSecurity_TestCases.TC_SEC_ITSS_SND_CAM_27_BV
#--------------------------------------- DENM ------------------------------------------
ItsSecurity_TestCases.TC_SEC_ITSS_SND_DENM_01_BV
#ItsSecurity_TestCases.TC_SEC_ITSS_SND_DENM_01_BV
#ItsSecurity_TestCases.TC_SEC_ITSS_SND_DENM_02_BV
#ItsSecurity_TestCases.TC_SEC_ITSS_SND_DENM_03_BV
#ItsSecurity_TestCases.TC_SEC_ITSS_SND_DENM_04_BV
......
......@@ -29,8 +29,10 @@ module ItsSecurity_Pics {
} // End of type certificates_foi
type record of certificates_foi certificates_fois;
modulepar certificates_fois PICS_CERTFICATES_FOI := {
modulepar certificates_fois PX_CERTFICATES_FOI := {
{ cc_iutCert_A, sha256, '39CF4DF85C18EBA5'O, 'EFEB473043DD2B88'O, omit }, // CERT_IUT_A_AT
{ cc_iutCert_A_B, sha256, 'F437DE395A471B0A'O, 'FE18C80573BD41A5'O, omit }, // CERT_IUT_A_B_AT
{ cc_iutCert_A_B3, sha256, 'F437DE395A471B0A'O, '623F3CE451FA1A04'O, omit }, // CERT_IUT_A_B3_AT
{ cc_iutCert_B, sha256, '39CF4DF85C18EBA5'O, 'E9DAF8626F52D687'O, { circularRegion := { center := {436169490, 70533080}, radius := 5000 } } }, // CERT_IUT_B_AT
{ cc_iutCert_C, sha256, '39CF4DF85C18EBA5'O, '46C778C826B25328'O, { rectangularRegion := { { northWest := { latitude := 436618657, longitude := 70083912 }, southEast := { latitude := 435720322, longitude := 70982247 } } } } }, // CERT_IUT_C_AT
......@@ -48,6 +50,6 @@ module ItsSecurity_Pics {
/**
* @desc Certificate identifier to be used for X_CERTFICATE variant
*/
modulepar integer PICS_CERTFICATES_VAR := 0;
modulepar integer PX_CERTFICATES_VAR := 0;
} // End of module ItsSecurity_Pics
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment