Commit f15015da authored by Yann Garcia's avatar Yann Garcia
Browse files

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

parents 6f3c1eb9 b8076111

ccsrc/Protocols/Security/security_ecc.cc

+5 −1
Original line number Diff line number Diff line
@@ -680,7 +680,11 @@ int security_ecc::encrypt(const encryption_algotithm p_enc_algorithm, const OCTE 
}



int security_ecc::decrypt(const encryption_algotithm p_enc_algorithm, const OCTETSTRING& p_key, const OCTETSTRING& p_nonce, const OCTETSTRING& p_tag, const OCTETSTRING& p_enc_message, OCTETSTRING& p_message) {

  loggers::get_instance().log(">>> security_ecc::decrypt: %d", p_enc_algorithm);

  loggers::get_instance().log(">>> security_ecc::decrypt: p_enc_algorithm=%d", p_enc_algorithm);

  loggers::get_instance().log_msg(">>> security_ecc::decrypt: p_key=", p_key);

  loggers::get_instance().log_msg(">>> security_ecc::decrypt: p_nonce", p_nonce);

  loggers::get_instance().log_msg(">>> security_ecc::decrypt: p_tag", p_tag);

  loggers::get_instance().log_msg(">>> security_ecc::decrypt: p_enc_message", p_enc_message);



  _encryption_algotithm = p_enc_algorithm;

  _sym_key = p_key;

data/v3/asn1c_cert.tar.bz2

0 → 100644
+26.1 KiB

File added.

No diff preview for this file type.

View file

docker/Dockerfile

+4 −0
Original line number Diff line number Diff line
@@ -108,6 +108,10 @@ RUN cd /home/etsi/dev \ 
    && cd /home/etsi/dev/STF525_Its/scripts \

    && ./build_titan.bash \

    && . /home/etsi/devenv.bash \

    && cp /home/etsi/dev/STF525_Its/data/v3/asn1c_cert.tar.bz2 /home/etsi/tmp \

    && cd /home/etsi/tmp \

    && tar xvjf ./asn1c_cert.tar.bz2 \

    && cd /home/etsi/dev/STF525_Its/scripts \

    && ./update_its_project.bash \

    && cd ${HOME}/dev/etsi_its/src/AtsPki/objs \

    && ../bin/pki_generate_makefile.bash \

etc/AtsPki/AtsPki_Idnomic.cfg_

+9 −4
Original line number Diff line number Diff line
@@ -19,12 +19,14 @@ LibItsPki_Pics.PICS_HEADER_HOST_EC := "ea.utopia.plugtests2019.innovation.ke 
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_CA     := "dc.plugtests2019.innovation.keynectis.net"

LibItsPki_Pics.PICS_HEADER_HOST_TLM    := "cpoc.jrc.ec.europa.eu"



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_GET_URI_CTL   := "/getctl/1D3C7B499A054F8C";

LibItsPki_Pics.PICS_HTTP_GET_URI_CRL   := "/getcrl/1D3C7B499A054F8C";

LibItsPki_Pics.PICS_HTTP_GET_URI_ECTL  := "/data/certificates/ectl/ECTL_TEST_ETSI-PLUGTEST_6.0_2019-11-07.oer"



LibItsPki_Pics.PICS_ITS_S_SIGN_NITSP256_PRIVATE_KEY  := '5C25F97607DFC62972A147FAD8B7A7C939569F0F95ECD4C641724A68B51836E5'O

LibItsPki_Pics.PICS_ITS_S_SIGN_NISTP256_PUBLIC_KEY   := '020144E5174B0AFDA86BDB8B643B68D40030F5BDB9A9F090C64852CC3C20C9D5AD'O
@@ -72,11 +74,11 @@ system.httpAtVPort.params := "HTTP(codecs=http_its:http_etsi_ieee1609dot2_codec) 
#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.httpCaPort.params := "HTTP(codecs=http_its:http_etsi_ieee1609dot2_codec)/TCP(server=dc.plugtests2019.innovation.keynectis.net)"



system.httpTlmPort.params := "HTTP(codecs=http_its:http_etsi_ieee1609dot2_codec)/TCP(debug=1,server=cpoc.jrc.ec.europa.eu,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
@@ -184,9 +186,12 @@ system.httpCaPort.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 when CA certificate is about to be revoked

ItsPki_TestCases.TC_RCA_CRLGEN_02_BV

#ItsPki_TestCases.TC_RCA_CRLGEN_02_BV



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

#ItsPki_TestCases.TC_TLM_ECTLGEN_01_BV



[MAIN_CONTROLLER]

# The options herein control the behavior of MC.

etc/AtsRSUsSimulator/AtsRSUSimulator.cfg

+1 −1
Original line number Diff line number Diff line
@@ -71,7 +71,7 @@ LibItsPki_Pics.PICS_HTTP_POST_URI_AT := "/aa/authorization" 
LibItsPki_Pics.PICS_HTTP_POST_URI_ATV                := "/ea/authval"

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_CANONICAL_ID               := '1B4CA1210123AE900BBE6C3EBAE7E87DA20DBDAB1E7B2EC0691C51C1021900AA'O

LibItsPki_Pics.PICS_ITS_S_CANONICAL_ID               := '455453492D4954532D303031'O

LibItsPki_Pics.PICS_TS_EA_CERTIFICATE_ID             := "CERT_TS_A_EA"

LibItsPki_Pics.PICS_TS_AA_CERTIFICATE_ID             := "CERT_TS_A_AA"