Commit 118e09db authored by Yann Garcia's avatar Yann Garcia
Browse files

Realign ASN.1 files for Security

parent 0967f8d5

ccsrc/Ports/LibIts_ports/Pki_ports/AdapterControlPort_Pki.partC

+1 −1
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ 
#include "loggers.hh"

#include "registration.hh"



#include "pki_layer.hh"

//#include "pki_layer.hh"



//=============================================================================

namespace LibItsPki__TestSystem {

ccsrc/Protocols/Security/etsi_ts102941_data_codec.cc

+6 −6
Original line number Diff line number Diff line
@@ -2,29 +2,29 @@ 


#include "loggers.hh"



int etsi_ts102941_data_codec::encode (const EtsiTs102941MessagesCa::EtsiTs102941Data& p_etsi_ts_10291_data, OCTETSTRING& p_data)

int etsi_ts102941_data_codec::encode (const EtsiTs102941MessagesCa::EtsiTs102941Data& p_etsi_ts_102941_data, OCTETSTRING& p_data)

{

  loggers::get_instance().log(">>> etsi_ts102941_data_codec::encode: %s", p_etsi_ts_10291_data.get_descriptor()->name);

  loggers::get_instance().log(">>> etsi_ts102941_data_codec::encode: %s", p_etsi_ts_102941_data.get_descriptor()->name);



  BITSTRING b;

  TTCN_EncDec::clear_error();

  TTCN_Buffer buffer;

  p_etsi_ts_10291_data.encode(*p_etsi_ts_10291_data.get_descriptor(), buffer, TTCN_EncDec::CT_OER);

  p_etsi_ts_102941_data.encode(*p_etsi_ts_102941_data.get_descriptor(), buffer, TTCN_EncDec::CT_OER);

  p_data = OCTETSTRING(buffer.get_len(), buffer.get_data());

  loggers::get_instance().log_msg("etsi_ts102941_data_codec::encode: ", p_data);



  return 0;

}



int etsi_ts102941_data_codec::decode (const OCTETSTRING& p_data, EtsiTs102941MessagesCa::EtsiTs102941Data& p_etsi_ts_10291_data, params* p_params)

int etsi_ts102941_data_codec::decode (const OCTETSTRING& p_data, EtsiTs102941MessagesCa::EtsiTs102941Data& p_etsi_ts_102941_data, params* p_params)

{

  loggers::get_instance().log_msg(">>> etsi_ts102941_data_codec::decode: ", p_data);



  TTCN_EncDec::clear_error();

  TTCN_Buffer decoding_buffer(p_data);

  //  _params = params;

  p_etsi_ts_10291_data.decode(*p_etsi_ts_10291_data.get_descriptor(), decoding_buffer, TTCN_EncDec::CT_OER);

  p_etsi_ts_102941_data.decode(*p_etsi_ts_102941_data.get_descriptor(), decoding_buffer, TTCN_EncDec::CT_OER);



  loggers::get_instance().log_msg("<<< etsi_ts102941_data_codec::decode: ", (const Base_Type&)p_etsi_ts_10291_data);

  loggers::get_instance().log_msg("<<< etsi_ts102941_data_codec::decode: ", (const Base_Type&)p_etsi_ts_102941_data);

  return 0;

}

etc/AtsIVIM/AtsIVIM.cfg

+8 −11
Original line number Diff line number Diff line 


[MODULE_PARAMETERS]

# This section shall contain the values of all parameters that are defined in your TTCN-3 modules.

LibItsGeoNetworking_Pics.PICS_GN_LOCAL_GN_ADDR := {

  typeOfAddress := e_initial,

  stationType := e_passengerCar,

  stationCountryCode := 33,

  mid := '001C6B00FF51'O

}



LibItsGeoNetworking_Pixits.PX_GN_UPPER_LAYER := e_btpA

# IUT Station ID

LibItsCommon_Pixits.PX_IUT_STATION_ID := 2533729309



LibItsGeoNetworking_Pixits.PX_GN_UPPER_LAYER := e_btpB



[LOGGING]

# In this section you can specify the name of the log file and the classes of events
@@ -90,14 +87,14 @@ LogEventTypes:= Yes 
#     time_offset : Time offset, used to skip packets with time offset < time_offset

#     save_mode   : 1 to save sent packet, 0 otherwise



system.ivimPort.params := "IVIM/BTP(type=btpB,dst_port=2001,src_port=0)/GN(ll_address=0800275c4959,latitude=43551050,longitude=10298730,distanceA=1500,distanceB=1500,angle=0,expiry=1000,beaconing=0,its_aid=141)/ETH(mac_src=0800275c4959,mac_bc=FFFFFFFFFFFF,eth_type=8947)/PCAP(mac_src=0800275c4959,nic=eth2,filter=and ether proto 0x8947)"

system.ivimPort.params := "IVIM(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/yann/tmp/asn1c_cert)/ETH(mac_src=dc536045af7e)/PCAP(mac_src=dc536045af7e,nic=wlp2s0,filter=and ether proto 0x8947)"



# IVIM UpperTester port based on UDP (ETSI Wlan)

system.utPort.params := "UT_IVIM/UDP(dst_ip=192.168.1.252)"

system.utPort.params := "UT_IVIM(debug=1)/UDP(src_port=12345,reuse_incoming_source_adddress=1)"



[EXECUTE]

#ItsIvim_TestCases.TC_IS_IVI_MSGF_BV_01

ItsIvim_TestCases.TC_IS_IVI_EVGN_BV_01

ItsIvim_TestCases.TC_IS_IVI_MSGF_BV_01

#ItsIvim_TestCases.TC_IS_IVI_EVGN_BV_01



[MAIN_CONTROLLER]

# The options herein control the behavior of MC.

etc/AtsPki/AtsPki_Idnomic.cfg_

+13 −13
Original line number Diff line number Diff line
@@ -16,9 +16,9 @@ LibItsHttp_Pics.PICS_HEADER_CONTENT_TYPE := "application/x-its-request" 
LibItsHttp_Pics.PICS_HEADER_CTL_CONTENT_TYPE := "application/x-its-crl"



LibItsPki_Pics.PICS_MULTIPLE_END_POINT := true

LibItsPki_Pics.PICS_HEADER_HOST_EC     := "ea.utopia.plugtests2019.innovation.keynectis.net"

LibItsPki_Pics.PICS_HEADER_HOST_ATV    := "ea.utopia.plugtests2019.innovation.keynectis.net"

LibItsPki_Pics.PICS_HEADER_HOST_AT     := "aa.utopia.plugtests2019.innovation.keynectis.net"

LibItsPki_Pics.PICS_HEADER_HOST_EC     := "0.atos-ea.l0.c-its-pki.eu"

LibItsPki_Pics.PICS_HEADER_HOST_ATV    := "0.atos-ea.l0.c-its-pki.eu"

LibItsPki_Pics.PICS_HEADER_HOST_AT     := "0.atos-aa.l0.c-its-pki.eu"

LibItsPki_Pics.PICS_HEADER_HOST_CA     := "0.atos-dc.l0.c-its-pki.eu"

LibItsPki_Pics.PICS_HEADER_HOST_TLM    := "0.atos-dc.l0.c-its-pki.eu"
@@ -27,7 +27,7 @@ LibItsPki_Pics.PICS_HTTP_POST_URI_AT := "/" 
LibItsPki_Pics.PICS_HTTP_POST_URI_ATV  := "/"

LibItsPki_Pics.PICS_HTTP_GET_URI_CTL   := "/103600/3-1/getctl/347A3B143C94C298"

LibItsPki_Pics.PICS_HTTP_GET_URI_CRL   := "/103600/3-1/getcrl/347A3B143C94C298"

LibItsPki_Pics.PICS_HTTP_GET_URI_ECTL  := "/103600/3-1/getctl/347A3B143C94C298"

LibItsPki_Pics.PICS_HTTP_GET_URI_ECTL  := "/103600/1-1/getctl/0DA3EE9ACF7F9F14"



LibItsPki_Pics.PICS_ITS_S_SIGN_NITSP256_PRIVATE_KEY  := '5C25F97607DFC62972A147FAD8B7A7C939569F0F95ECD4C641724A68B51836E5'O

LibItsPki_Pics.PICS_ITS_S_SIGN_NISTP256_PUBLIC_KEY   := '020144E5174B0AFDA86BDB8B643B68D40030F5BDB9A9F090C64852CC3C20C9D5AD'O
@@ -70,23 +70,23 @@ LogEventTypes:= Yes 


[TESTPORT_PARAMETERS]

# Multiple HTTP component ports

system.httpEcPort.params := "HTTP(codecs=http_its:http_etsi_ieee1609dot2_codec)/TCP(server=ea.utopia.plugtests2019.innovation.keynectis.net)"

system.httpAtVPort.params := "HTTP(codecs=http_its:http_etsi_ieee1609dot2_codec)/TCP(server=ea.utopia.plugtests2019.innovation.keynectis.net)"

system.httpEcPort.params := "HTTP(codecs=http_its:http_etsi_ieee1609dot2_codec)/TCP(server=90.84.246.190)"

system.httpAtVPort.params := "HTTP(codecs=http_its:http_etsi_ieee1609dot2_codec)/TCP(server=90.84.246.190)"

#system.httpAtVPort.params := "HTTP(codecs=http_its:http_etsi_ieee1609dot2_codec)/TCP(debug=1,server_mode=1,server=192.168.1.41,local_port=80)" # Multiple HTTP component ports specific to TC_SECPKI_AA_AUTHVAL_xx

system.httpAtPort.params := "HTTP(codecs=http_its:http_etsi_ieee1609dot2_codec)/TCP(server=aa.utopia.plugtests2019.innovation.keynectis.net)"

system.httpAtPort.params := "HTTP(codecs=http_its:http_etsi_ieee1609dot2_codec)/TCP(server=90.84.246.190)"

system.httpCaPort.params := "HTTP(codecs=http_its:http_etsi_ieee1609dot2_codec)/TCP(debug=1,server=90.84.246.190,use_ssl=1)"

system.httpTlmPort.params := "HTTP(codecs=http_its:http_etsi_ieee1609dot2_codec)/TCP(debug=1,server=90.84.246.190,use_ssl=1)"



[EXECUTE]

# The EnrolmentResponse message shall be sent by the EA to the ITS-S across the interface at reference point S3 in response to a received EnrolmentRequest message

#ItsPki_TestCases.TC_SECPKI_EA_ENR_RCV_01_BV

ItsPki_TestCases.TC_SECPKI_EA_ENR_RCV_01_BV



# Check that EA doesn't accept Enrolment rekeying request when enrolment is not permitted by signing certificate (not containing an item of type PsidSsp)

#ItsPki_TestCases.TC_SECPKI_EA_ENR_RCV_02_BI_01

ItsPki_TestCases.TC_SECPKI_EA_ENR_RCV_02_BI_01

# Check that EA doesn't accept Enrolment rekeying request when enrolment is not permitted by signing certificate (containing opaque[0] (version) indicating other value than 1)

#ItsPki_TestCases.TC_SECPKI_EA_ENR_RCV_02_BI_02

ItsPki_TestCases.TC_SECPKI_EA_ENR_RCV_02_BI_02

# Check that EA doesn't accept Enrolment rekeying request when enrolment is not permitted by signing certificate (containing opaque[1] (value) indicating "Enrolment Request" (bit 1) set to 0)

#ItsPki_TestCases.TC_SECPKI_EA_ENR_RCV_02_BI_03

ItsPki_TestCases.TC_SECPKI_EA_ENR_RCV_02_BI_03



# Enroll an ITS-Station, but with a canonical-ID, that is not registered.

#ItsPki_TestCases.TC_SECPKI_EA_ENR_RCV_05_BI
@@ -187,12 +187,12 @@ system.httpTlmPort.params := "HTTP(codecs=http_its:http_etsi_ieee1609dot2_codec) 
#ItsPki_TestCases.TC_SECPKI_AA_AUTHVAL_01_BV



# Check that the RootCA generates the Full CTL when new EA is about to be added to the Root CTL

#ItsPki_TestCases.TC_RCA_CTLGEN_01_BV

ItsPki_TestCases.TC_RCA_CTLGEN_01_BV

# Check that the RootCA generates the CRL signed with appropriate certificate.

ItsPki_TestCases.TC_RCA_CRLGEN_01_BV



# Check that the TLM generates the ECTL when new RootCA is about to be added

#ItsPki_TestCases.TC_TLM_ECTLGEN_01_BV

ItsPki_TestCases.TC_TLM_ECTLGEN_01_BV



[MAIN_CONTROLLER]

# The options herein control the behavior of MC.

scripts/update_its_project.bash

+10 −0
Original line number Diff line number Diff line
@@ -318,6 +318,16 @@ then 
    cp ${PATH_PATCHES}/run_mtc.bash ${PATH_DEV_ITS}/src/AtsDENM/bin

    cp ${PATH_PATCHES}/run_ptcs.bash ${PATH_DEV_ITS}/src/AtsDENM/bin

    cp ${PATH_PATCHES}/run_all.bash ${PATH_DEV_ITS}/src/AtsDENM/bin

    # Update IVIM

    cp ${PATH_PATCHES}/ivim_generate_makefile.bash ${PATH_DEV_ITS}/src/AtsIVIM/bin

    cp ${PATH_PATCHES}/run_mtc.bash ${PATH_DEV_ITS}/src/AtsIVIM/bin

    cp ${PATH_PATCHES}/run_ptcs.bash ${PATH_DEV_ITS}/src/AtsIVIM/bin

    cp ${PATH_PATCHES}/run_all.bash ${PATH_DEV_ITS}/src/AtsIVIM/bin

    # Update MAPEM/SPATEM

    cp ${PATH_PATCHES}/mapemstatem_generate_makefile.bash ${PATH_DEV_ITS}/src/AtsMapemSpatem/bin

    cp ${PATH_PATCHES}/run_mtc.bash ${PATH_DEV_ITS}/src/AtsMapemSpatem/bin

    cp ${PATH_PATCHES}/run_ptcs.bash ${PATH_DEV_ITS}/src/AtsMapemSpatem/bin

    cp ${PATH_PATCHES}/run_all.bash ${PATH_DEV_ITS}/src/AtsMapemSpatem/bin

    # Update RSUsSimulator

    cp ${PATH_PATCHES}/rsusimulator_generate_makefile.bash ${PATH_DEV_ITS}/src/AtsRSUsSimulator/bin

    cp ${PATH_PATCHES}/run_mtc.bash ${PATH_DEV_ITS}/src/AtsRSUsSimulator/bin