Commit 874c70bc authored by YannGarcia's avatar YannGarcia
Browse files

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

parents 9a680a3c 53b9f4c6

docker/Dockerfile

+1 −0
Original line number Original line Diff line number Diff line
@@ -39,6 +39,7 @@ RUN echo "docker-titan-STF525" > /etc/hostname \ 
      libssl-dev \

      libssl-dev \

      libtool-bin \

      libtool-bin \

      libtool \

      libtool \

      libwebsockets-dev \

      libwireshark-dev \

      libwireshark-dev \

      libxml2-dev \

      libxml2-dev \

      lsof \

      lsof \

etc/AtsPki/AtsPki.cfg

+38 −46
Original line number Original line Diff line number Diff line 
[MODULE_PARAMETERS]

[MODULE_PARAMETERS]

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

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





# The GeoNetworking address of the IUT.

LibItsGeoNetworking_Pics.PICS_GN_LOCAL_GN_ADDR := {

  typeOfAddress := e_manual,

  stationType := e_passengerCar,

  stationCountryCode := 0,

  mid := '000000000001'O

#  typeOfAddress := e_initial,

#  stationType := e_unknown, #e_roadSideUnit,

#  stationCountryCode := 0, #33,

#  mid := '4C5E0C14D2EA'O

}



LibItsGeoNetworking_Pixits.PX_GN_UPPER_LAYER := e_btpB

LibItsGeoNetworking_Pixits.PX_NEIGHBOUR_DISCOVERY_DELAY := 2.0



# Enable Security support

# Enable Security support

LibItsGeoNetworking_Pics.PICS_GN_SECURITY := true

LibItsGeoNetworking_Pics.PICS_GN_SECURITY := true

# Root path to access certificate stored in files, identified by certficate ID

# Root path to access certificate stored in files, identified by certficate ID
@@ -26,19 +11,26 @@ LibItsSecurity_Pixits.PX_IUT_SEC_CONFIG_NAME := "asn1c_cert" 
LibItsHttp_Pics.PICS_HEADER_CONTENT_TYPE  := "application/x-its-request"

LibItsHttp_Pics.PICS_HEADER_CONTENT_TYPE  := "application/x-its-request"





LibItsPki_Pics.PICS_MULTIPLE_END_POINT := true

LibItsPki_Pics.PICS_MULTIPLE_END_POINT := true

LibItsPki_Pics.PICS_HEADER_HOST_EC                   := "etsi.enrolment.ea.msi-dev.acloud.gemalto.com"

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

LibItsPki_Pics.PICS_HEADER_HOST_ATV                  := "etsi.authvalidation.ea.msi-dev.acloud.gemalto.com"

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

LibItsPki_Pics.PICS_HEADER_HOST_AT                   := "etsi.authorizationa.a.msi-dev.acloud.gemalto.com"

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



LibItsPki_Pics.PICS_HTTP_POST_URI_EC   := "/";

LibItsPki_Pics.PICS_HTTP_POST_URI_AT   := "/";

LibItsPki_Pics.PICS_HTTP_POST_URI_ATV  := "/";





LibItsPki_Pics.PICS_HTTP_POST_URI_EC                 := "/"

LibItsPki_Pics.PICS_HTTP_POST_URI_AT                 := "/"

LibItsPki_Pics.PICS_HTTP_POST_URI_ATV                := "/"

LibItsPki_Pics.PICS_ITS_S_SIGN_NITSP256_PRIVATE_KEY  := '5C25F97607DFC62972A147FAD8B7A7C939569F0F95ECD4C641724A68B51836E5'O

LibItsPki_Pics.PICS_ITS_S_SIGN_NITSP256_PRIVATE_KEY  := '5C25F97607DFC62972A147FAD8B7A7C939569F0F95ECD4C641724A68B51836E5'O

LibItsPki_Pics.PICS_ITS_S_SIGN_NISTP256_PUBLIC_KEY   := '020144E5174B0AFDA86BDB8B643B68D40030F5BDB9A9F090C64852CC3C20C9D5AD'O

LibItsPki_Pics.PICS_ITS_S_SIGN_NISTP256_PUBLIC_KEY   := '020144E5174B0AFDA86BDB8B643B68D40030F5BDB9A9F090C64852CC3C20C9D5AD'O

LibItsPki_Pics.PICS_ITS_S_CANONICAL_ID               := '1B4CA1210123AE900BBE6C3EBAE7E87DA20DBDAB1E7B2EC0691C51C1021900AA'O

LibItsPki_Pics.PICS_ITS_S_CANONICAL_ID               := '455453492D4954532D303031'O

LibItsPki_Pics.PICS_TS_EA_CERTIFICATE_ID             := "CERT_GEMALTO_EA"

LibItsPki_Pics.PICS_TS_EA_CERTIFICATE_ID             := "CERT_IDNOMIC_EA"

LibItsPki_Pics.PICS_TS_AA_CERTIFICATE_ID             := "CERT_GEMALTO_AA"

LibItsPki_Pics.PICS_TS_AA_CERTIFICATE_ID             := "CERT_IDNOMIC_AA"



#LibItsPki_Pixits.PX_INCLUDE_ENCRYPTION_KEYS := false # No encryption key in Authorization request

#LibItsPki_Pixits.PICS_PKI_AUTH_POP          := false # Do not use Signed for PoP in Authorization requet



#LibItsPki_Pics.PICS_SECPKI_REENROLMENT := false # Check in logs the pattern '==> EC ' to find the required information for re-enrolment

#LibItsPki_Pixits.PX_EC_PRIVATE_KEY     := '170D1EA638C300BD16F0025768C0F1FAA6BE23963E46AD10F79103914265D294'O

#LibItsPki_Pixits.PX_EC_HASH            := 'DFEFC2A74C8ADD0C8B74B958EE072229D25DEAAAE30D134193D091890E8F3C2C'O

#LibItsPki_Pixits.PX_EC_HASHED_ID8      := '93D091890E8F3C2C'O





[LOGGING]

[LOGGING]

# In this section you can specify the name of the log file and the classes of events

# In this section you can specify the name of the log file and the classes of events
@@ -55,21 +47,12 @@ LogEventTypes:= Yes 
#TimeStampFormat := DateTime

#TimeStampFormat := DateTime





[TESTPORT_PARAMETERS]

[TESTPORT_PARAMETERS]

# Single GeoNetworkingPort component port

# Multiple HTTP component ports

system.geoNetworkingPort.params := "GN(ll_address=4C5E0C14D2EA,latitude=43551050,longitude=10298730)/ETH(mac_src=080027500f9b)/PCAP(mac_src=080027500f9b,nic=eth2)"

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

# Single HTTP component port

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

system.httpPort.params := "HTTP(codecs=http_its:http_etsi_ieee1609dot2_codec)/TCP(debug=1,server=etsi.enrolment.ea.msi-dev.acloud.gemalto.com,port=80,use_ssl=0)"

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

system.httpEcPort.params := "HTTP(codecs=http_its:http_etsi_ieee1609dot2_codec)/TCP(debug=1,server=etsi.enrolment.ea.msi-dev.acloud.gemalto.com,port=80,use_ssl=0)"

system.httpAtVPort.params := "HTTP(codecs=http_its:http_etsi_ieee1609dot2_codec)/TCP(debug=1,server=etsi.authvalidation.ea.msi-dev.acloud.gemalto.com,port=80,use_ssl=0)"

system.httpAtPort.params := "HTTP(codecs=http_its:http_etsi_ieee1609dot2_codec)/TCP(debug=1,server=etsi.authorization.aa.msi-dev.acloud.gemalto.com,port=80,use_ssl=0)"



# GeoNetworking UpperTester port based on UDP

system.utPort.params := "UT_PKI/UDP(dst_ip=172.23.0.1,dst_port=8000)"





[EXECUTE]

[EXECUTE]

#ItsPki_TestCases.TC_SECPKI_ITSS_ENR_01_BV

#ItsPki_TestCases.TC_SECPKI_ITSS_ENR_02_BV



# 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

# 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

# Check that EA doesn't accept Enrolment rekeying request when enrolment is not permitted by signing certificate
@@ -77,13 +60,10 @@ system.utPort.params := "UT_PKI/UDP(dst_ip=172.23.0.1,dst_port=8000)" 




# The EnrolmentResponse message shall be encrypted using an ETSI TS 103 097 approved algorithm and the encryption shall be done with the same AES key as the one used by the ITS-S requestor for the encryption of the EnrolmentRequest message.

# The EnrolmentResponse message shall be encrypted using an ETSI TS 103 097 approved algorithm and the encryption shall be done with the same AES key as the one used by the ITS-S requestor for the encryption of the EnrolmentRequest message.

#ItsPki_TestCases.TC_SECPKI_EA_ENR_01_BV

#ItsPki_TestCases.TC_SECPKI_EA_ENR_01_BV

# The EnrolmentResponse message shall be encrypted using an ETSI TS 103 097 approved algorithm and the encryption shall be done with the same AES key as the one used by the ITS-S requestor for the encryption of the EnrolmentRequest message

#ItsPki_TestCases.TC_SECPKI_EA_ENR_02_BV

#ItsPki_TestCases.TC_SECPKI_EA_ENR_02_BV

# The outermost structure is an EtsiTs103097Data-Encrypted structure containing the component recipients containing one instance of RecipientInfo of choice pskRecipInfo, which contains the HashedId8 of the symmetric key used by the ITS-S to encrypt the EnrolmentRequest message to which the response is built and containing the component ciphertext, once decrypted, contains an EtsiTs103097Data-Signed structure

#ItsPki_TestCases.TC_SECPKI_EA_ENR_03_BV

#ItsPki_TestCases.TC_SECPKI_EA_ENR_03_BV

# Within the headerInfo of the tbsData, the psid shall be set to secured certificate request� as assigned in ETSI TS 102 965 and the generationTime shall be present.

#ItsPki_TestCases.TC_SECPKI_EA_ENR_04_BV

#ItsPki_TestCases.TC_SECPKI_EA_ENR_04_BV

#ItsPki_TestCases.TC_SECPKI_EA_ENR_05_BV

ItsPki_TestCases.TC_SECPKI_EA_ENR_05_BV

#ItsPki_TestCases.TC_SECPKI_EA_ENR_06_BV

#ItsPki_TestCases.TC_SECPKI_EA_ENR_06_BV

#ItsPki_TestCases.TC_SECPKI_EA_ENR_07_BV

#ItsPki_TestCases.TC_SECPKI_EA_ENR_07_BV

#ItsPki_TestCases.TC_SECPKI_EA_ENR_01_BV

#ItsPki_TestCases.TC_SECPKI_EA_ENR_01_BV
@@ -91,8 +71,20 @@ system.utPort.params := "UT_PKI/UDP(dst_ip=172.23.0.1,dst_port=8000)" 
#ItsPki_TestCases.TC_SECPKI_EA_ENR_09_BV

#ItsPki_TestCases.TC_SECPKI_EA_ENR_09_BV

#ItsPki_TestCases.TC_SECPKI_EA_ENR_10_BV

#ItsPki_TestCases.TC_SECPKI_EA_ENR_10_BV

#ItsPki_TestCases.TC_SECPKI_EA_ENR_11_BV

#ItsPki_TestCases.TC_SECPKI_EA_ENR_11_BV

ItsPki_TestCases.TC_SECPKI_SND_EA_AA_BV_01

#ItsPki_TestCases.TC_SECPKI_EA_ENR_12_BV

#ItsPki_TestCases.TC_SEC_PKI_SND_AA_BV_01



# 

#ItsPki_TestCases.TC_SECPKI_EA_AUTHVAL_RCV_01_BV



#

#ItsPki_TestCases.TC_SECPKI_AA_AUTH_RCV_01_BV

#ItsPki_TestCases.TC_SECPKI_AA_AUTH_RCV_03_BI

#ItsPki_TestCases.TC_SECPKI_AA_AUTH_RCV_04_BI

#ItsPki_TestCases.TC_SECPKI_AA_AUTH_RCV_05_BI

#ItsPki_TestCases.TC_SECPKI_AA_AUTH_RCV_06_BI

#ItsPki_TestCases.TC_SECPKI_AA_AUTH_RCV_07_BI



#ItsPki_TestCases.TC_SECPKI_AA_AUTHVAL_01_BV





[MAIN_CONTROLLER]

[MAIN_CONTROLLER]

# The options herein control the behavior of MC.

# The options herein control the behavior of MC.

ttcn/AtsGenCert/ItsGenCert_Functions.ttcn

+2 −2
Original line number Original line Diff line number Diff line
@@ -118,7 +118,7 @@ module ItsGenCert_Functions { 
        if (p_certificate_details.public_enc_key_compressed_mode == 0) {

        if (p_certificate_details.public_enc_key_compressed_mode == 0) {

          p_certificate_details.certificate.toBeSigned.encryptionKey := valueof(m_encryptionKey(

          p_certificate_details.certificate.toBeSigned.encryptionKey := valueof(m_encryptionKey(

                                                                                                aes128Ccm, 

                                                                                                aes128Ccm, 

                                                                                                m_publicEncryptionKey_ecdsaNistP256(

                                                                                                m_publicEncryptionKey_eciesNistP256(

                                                                                                                                    m_eccP256CurvePoint_compressed_y_0(

                                                                                                                                    m_eccP256CurvePoint_compressed_y_0(

                                                                                                                                                                       p_certificate_details.public_enc_key_compressed

                                                                                                                                                                       p_certificate_details.public_enc_key_compressed

                                                                                                                                                                       )))

                                                                                                                                                                       )))
@@ -126,7 +126,7 @@ module ItsGenCert_Functions { 
        } else {

        } else {

          p_certificate_details.certificate.toBeSigned.encryptionKey := valueof(m_encryptionKey(

          p_certificate_details.certificate.toBeSigned.encryptionKey := valueof(m_encryptionKey(

                                                                                                aes128Ccm, 

                                                                                                aes128Ccm, 

                                                                                                m_publicEncryptionKey_ecdsaNistP256(

                                                                                                m_publicEncryptionKey_eciesNistP256(

                                                                                                                                    m_eccP256CurvePoint_compressed_y_1(

                                                                                                                                    m_eccP256CurvePoint_compressed_y_1(

                                                                                                                                                                       p_certificate_details.public_enc_key_compressed

                                                                                                                                                                       p_certificate_details.public_enc_key_compressed

                                                                                                                                                                       )))

                                                                                                                                                                       )))

ttcn/AtsPki/ItsPki_TestCases.ttcn

+1 −1

File changed.

Contains only whitespace changes.