Commit 8c809dc8 authored by Yann Garcia's avatar Yann Garcia
Browse files

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

parents b5b43e17 e71dfbb9
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
......@@ -395,10 +395,10 @@ int security_ecc::generate_and_derive_ephemeral_key(const encryption_algotithm p
int result = ::ECDH_compute_key(
(unsigned char*)static_cast<const unsigned char*>(_secret_key),
_secret_key.lengthof(),
ec_point, // From sender's public key
_ec_key, // From recipient's private key
ec_point, // From recipient's public key
_ec_key, // From ephemeral's private key
nullptr);
if (result == -1) {
if (result != _secret_key.lengthof()) {
loggers::get_instance().warning("security_ecc::generate_and_derive_ephemeral_key (1): Failed to generate shared secret key");
::EC_POINT_free(ec_point);
return -1;
......@@ -438,7 +438,7 @@ int security_ecc::generate_and_derive_ephemeral_key(const encryption_algotithm p
hmac_256.generate(static_cast<const unsigned char*>(_enc_sym_key), _enc_sym_key.lengthof(), static_cast<const unsigned char*>(k2), k2.lengthof(), _tag);
loggers::get_instance().log_msg("security_ecc::generate_and_derive_ephemeral_key (1): _tag: ", _tag);
// Generate random IV (nonce
// Generate random IV (nonce)
BIGNUM* r = ::BN_new();
::BN_pseudo_rand(r, nonce_length * 8, -1, 0);
_nonce = int2oct(0, nonce_length);
......@@ -517,7 +517,7 @@ int security_ecc::generate_and_derive_ephemeral_key(const encryption_algotithm p
ec_point, // From recipient's private key
_ec_key, // From sender's public key
nullptr);
if (result == -1) {
if (result != _secret_key.lengthof()) {
loggers::get_instance().warning("security_ecc::generate_and_derive_ephemeral_key (2): Failed to compute shared secret key");
::EC_POINT_free(ec_point);
return -1;
......
......@@ -469,7 +469,14 @@ int security_services::sign_payload(const OCTETSTRING& p_unsecured_gn_payload, O
// Set secured field according to the payload!
header_info.psid() = converter::get_instance().string_to_int(p_params[params::its_aid]);
header_info.expiryTime().set_to_omit();
header_info.generationLocation().set_to_omit();
if (p_params[params::its_aid].compare("37") == 0) { // Only used by AtsRSUSimulator
// Mandatory for DENM payload
OPTIONAL<IEEE1609dot2BaseTypes::ThreeDLocation> location(IEEE1609dot2BaseTypes::ThreeDLocation(_latitude, _longitude, _elevation));
header_info.generationLocation() = location;
loggers::get_instance().log_msg("security_services::sign_payload: generationLocation: ", header_info.generationLocation());
} else {
header_info.generationLocation().set_to_omit();
}
header_info.p2pcdLearningRequest().set_to_omit();
header_info.missingCrlIdentifier().set_to_omit();
if (_params[params::encrypted_mode].compare("1") == 0) {
......
......@@ -49,13 +49,13 @@ LogEventTypes:= Yes
[TESTPORT_PARAMETERS]
# Multiple HTTP component ports for ITS-S, EA and TC_SECPKI_AA_AUTH_RCV_*
#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.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(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.httpAtPort.params := "HTTP(codecs=http_its:http_etsi_ieee1609dot2_codec)/TCP(server=aa.utopia.plugtests2019.innovation.keynectis.net)"
# Multiple HTTP component ports for TC_SECPKI_AA_AUTHVAL_*
system.httpAtVPort.params := "HTTP(codecs=http_its:http_etsi_ieee1609dot2_codec)/TCP(debug=1,server_mode=1,server=192.168.1.252,local_port=8080)"
system.httpAtPort.params := "HTTP(codecs=http_its:http_etsi_ieee1609dot2_codec)/TCP(server=aa.utopia.plugtests2019.innovation.keynectis.net)"
#system.httpAtVPort.params := "HTTP(codecs=http_its:http_etsi_ieee1609dot2_codec)/TCP(debug=1,server_mode=1,server=192.168.1.252,local_port=8080)"
#system.httpAtPort.params := "HTTP(codecs=http_its:http_etsi_ieee1609dot2_codec)/TCP(server=aa.utopia.plugtests2019.innovation.keynectis.net)"
[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
......@@ -82,7 +82,7 @@ system.httpAtPort.params := "HTTP(codecs=http_its:http_etsi_ieee1609dot2_codec)/
#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_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
......@@ -96,7 +96,7 @@ system.httpAtPort.params := "HTTP(codecs=http_its:http_etsi_ieee1609dot2_codec)/
#ItsPki_TestCases.TC_SECPKI_AA_AUTH_RCV_13_BI
#ItsPki_TestCases.TC_SECPKI_AA_AUTH_RCV_14_BI
ItsPki_TestCases.TC_SECPKI_AA_AUTHVAL_01_BV
#ItsPki_TestCases.TC_SECPKI_AA_AUTHVAL_01_BV
[MAIN_CONTROLLER]
# The options herein control the behavior of MC.
......
File mode changed from 100644 to 100755
File mode changed from 100644 to 100755
#!/bin/bash
# Turn on debug mode
#set -vx
#set -e
# Colors and Prompt
export PS1="\w\$ "
export PS1="\D{%Y-%m-%d %H:%M:%S} \w\n\$ "
export EDITOR=emacs
set -o emacs
# Home working directories
export HOME_FRAMEWORKS=${HOME}/frameworks
export HOME_LIB=${HOME}/lib
export HOME_BIN=${HOME}/bin
export HOME_ETC=${HOME}/etc
export HOME_TMP=${HOME}/tmp
export HOME_DOCS=${HOME}/docs
# Home common include directory
export HOME_INC=${HOME}/include
# Update PATH environment variable
export PATH=${HOME_BIN}:${PATH}
# Update LD_LIBRARY_PATH environment variable
if [ -z "${LD_LIBRARY_PATH}" ]
then
export LD_LIBRARY_PATH=${HOME_LIB}:/usr/local/lib:${HOME}/dev/etsi_its/lib
else
export LD_LIBRARY_PATH=${HOME_LIB}:/usr/local/lib:${HOME}/dev/etsi_its/lib:${LD_LIBRARY_PATH}
fi
# Add JAVA support
#export JAVA_VERSION=1.8.0_92
#export JAVA_JDK=jdk${JAVA_VERSION}
#if [ -d "${HOME_FRAMEWORKS}/${JAVA_JDK}" ]
#then
# export JAVA_HOME=${HOME_FRAMEWORKS}/${JAVA_JDK}/bin
#else
# unset JAVA_VERSION
# unset JAVA_JDK
#fi
# Add TITAN support
export TOP=${HOME_FRAMEWORKS}/titan/titan.core
export TTCN3_DIR=${TOP}/Install
if [ -d ${TTCN3_DIR} ]
then
export TTCN3_BROWSER=mozilla
export PATH=${TTCN3_DIR}/bin:${PATH}
export LD_LIBRARY_PATH=${TTCN3_DIR}/lib:${LD_LIBRARY_PATH}
export MANPATH=${TTCN3_DIR}/man:${MANPATH}
export TTCN3_LICENSE_FILE=${TTCN3_DIR}/etc/license/license.dat
export PATH_DEV_TTCN=${HOME}/dev/ttcn3
# ITS support
export PATH_DEV_ITS=${HOME}/dev/etsi_its
# Emergency Communication support
export PATH_DEV_EMCOM=${HOME}/dev/etsi_emcom
# Mobile-Edge Computing support
export PATH_DEV_MEC=${HOME}/dev/etsi_mec
# Validation folder
export VALIDATION_DIR=${HOME}
fi
# Start ssh-agent at login
#if [ -f "/usr/bin/ssh-agent" ]
#then
# eval `/usr/bin/ssh-agent -s`
# ssh-add -l
# ssh-add ${HOME}/.ssh/git_server_ssh_key_name
#fi
File mode changed from 100644 to 100755
File mode changed from 100644 to 100755
https://github.com/eclipse/titan.core.git
https://github.com/eclipse/titan.TestPorts.Common_Components.Abstract_Socket.git
https://github.com/eclipse/titan.TestPorts.HTTPmsg.git
https://github.com/eclipse/titan.TestPorts.LANL2asp.git
https://github.com/eclipse/titan.TestPorts.PCAPasp.git
https://github.com/eclipse/titan.TestPorts.PIPEasp.git
https://github.com/eclipse/titan.TestPorts.SCTPasp.git
https://github.com/eclipse/titan.TestPorts.SIPmsg.git
https://github.com/eclipse/titan.TestPorts.SQLasp.git
https://github.com/eclipse/titan.TestPorts.TCPasp.git
https://github.com/eclipse/titan.TestPorts.TELNETasp.git
https://github.com/eclipse/titan.TestPorts.UDPasp.git
......@@ -16,29 +18,118 @@ https://github.com/eclipse/titan.ProtocolModules.DNS.git
https://github.com/eclipse/titan.ProtocolModules.ICMP.git
https://github.com/eclipse/titan.ProtocolModules.ICMPv6.git
https://github.com/eclipse/titan.ProtocolModules.IP.git
https://github.com/eclipse/titan.ProtocolModules.RTP.git
https://github.com/eclipse/titan.ProtocolModules.RTSP.git
https://github.com/eclipse/titan.ProtocolModules.SMPP.git
https://github.com/eclipse/titan.ProtocolModules.SMTP.git
https://github.com/eclipse/titan.ProtocolModules.SNMP.git
https://github.com/eclipse/titan.ProtocolModules.TCP.git
https://github.com/eclipse/titan.ProtocolModules.UDP.git
https://github.com/eclipse/titan.EclipsePlug-ins.git
https://github.com/eclipse/titan.ProtocolModules.XMPP.git
https://github.com/eclipse/titan.misc.git
https://github.com/eclipse/titan.TestPorts.LDAPasp_RFC4511.git
https://github.com/eclipse/titan.TestPorts.LDAPmsg.git
https://github.com/eclipse/titan.TestPorts.Common_Components.Socket-API.git
https://github.com/eclipse/titan.TestPorts.SSHCLIENTasp.git
https://github.com/eclipse/titan.TestPorts.STDINOUTmsg.git
https://github.com/eclipse/titan.TestPorts.SUNRPCasp.git
https://github.com/eclipse/titan.TestPorts.UNIX_DOMAIN_SOCKETasp.git
https://github.com/eclipse/titan.TestPorts.IPL4asp.git
https://github.com/eclipse/titan.ProtocolModules.FrameRelay.git
https://github.com/eclipse/titan.ProtocolModules.H248_v2.git
https://github.com/eclipse/titan.ProtocolModules.IMAP_4rev1.git
https://github.com/eclipse/titan.ProtocolModules.ICAP.git
https://github.com/eclipse/titan.ProtocolModules.IKEv2.git
https://github.com/eclipse/titan.ProtocolModules.IPsec.git
https://github.com/eclipse/titan.ProtocolModules.IUA.git
https://github.com/eclipse/titan.ProtocolModules.JSON_v07_2006.git
https://github.com/eclipse/titan.ProtocolModules.L2TP.git
https://github.com/eclipse/titan.ProtocolModules.M3UA.git
https://github.com/eclipse/titan.ProtocolModules.MIME.git
https://github.com/eclipse/titan.ProtocolModules.MSRP.git
https://github.com/eclipse/titan.ProtocolModules.PPP.git
https://github.com/eclipse/titan.ProtocolModules.ProtoBuff.git
https://github.com/eclipse/titan.ProtocolModules.RADIUS_ProtocolModule_Generator.git
https://github.com/eclipse/titan.ProtocolModules.SRTP.git
https://github.com/eclipse/titan.ProtocolModules.WebSocket.git
https://github.com/eclipse/titan.ProtocolModules.HTTP2.0.git
https://github.com/eclipse/titan.Libraries.TCCUsefulFunctions.git
https://git.eclipse.org/r/titan/titan.ApplicationLibraries.CoAP
https://git.eclipse.org/r/titan/titan.ApplicationLibraries.MQTT
https://git.eclipse.org/r/titan/titan.ProtocolModules.CoAP.git
https://git.eclipse.org/r/titan/titan.ProtocolModules.MQTT.git
https://git.eclipse.org/r/titan/titan.ProtocolModules.SCTP.git
https://git.eclipse.org/r/titan/titan.ProtocolModules.SDP.git
https://git.eclipse.org/r/titan/titan.ProtocolModules.TLS.git
https://git.eclipse.org/r/titan/titan.TestPorts.GPIO.git
https://git.eclipse.org/r/titan/titan.TestPorts.Serial.git
https://git.eclipse.org/r/titan/titan.TestPorts.SocketCANasp.git
https://git.eclipse.org/r/titan/titan.TestPorts.Thrift_TPG.git
git://git.eclipse.org/gitroot/titan/titan.ApplicationLibraries.CoAP.git
git://git.eclipse.org/gitroot/titan/titan.ApplicationLibraries.HTTP.git
git://git.eclipse.org/gitroot/titan/titan.ApplicationLibraries.LWM2M.git
git://git.eclipse.org/gitroot/titan/titan.ApplicationLibraries.MBT.git
git://git.eclipse.org/gitroot/titan/titan.ApplicationLibraries.MQTT.git
git://git.eclipse.org/gitroot/titan/titan.Applications.IoT_Functiontest_Framework.git
git://git.eclipse.org/gitroot/titan/titan.Applications.IoT_Loadtest_Framework.git
git://git.eclipse.org/gitroot/titan/titan.Applications.RIoT.git
git://git.eclipse.org/gitroot/titan/titan.Libraries.CLL.git
git://git.eclipse.org/gitroot/titan/titan.Libraries.ServiceFramework.git
git://git.eclipse.org/gitroot/titan/titan.Libraries.TLS.git
git://git.eclipse.org/gitroot/titan/titan.Libraries.Web_GUI.git
git://git.eclipse.org/gitroot/titan/titan.ProtocolEmulations.M3UA.git
git://git.eclipse.org/gitroot/titan/titan.ProtocolEmulations.SCCP.git
git://git.eclipse.org/gitroot/titan/titan.ProtocolEmulations.SCTP.git
git://git.eclipse.org/gitroot/titan/titan.ProtocolEmulations.SUA.git
git://git.eclipse.org/gitroot/titan/titan.ProtocolModules.5G_system_TS29502_Nsmf_v15.git
git://git.eclipse.org/gitroot/titan/titan.ProtocolModules.5G_system_TS29503_Nudm_v15.git
git://git.eclipse.org/gitroot/titan/titan.ProtocolModules.5G_system_TS29508_Nsmf_v15.git
git://git.eclipse.org/gitroot/titan/titan.ProtocolModules.5G_system_TS29509_Nausf_v15.git
git://git.eclipse.org/gitroot/titan/titan.ProtocolModules.5G_system_TS29510_Nnrf_v15.git
git://git.eclipse.org/gitroot/titan/titan.ProtocolModules.5G_system_TS29511_N5g_eir_v15.git
git://git.eclipse.org/gitroot/titan/titan.ProtocolModules.5G_system_TS29512_Npcf_v15.git
git://git.eclipse.org/gitroot/titan/titan.ProtocolModules.5G_system_TS29514_Npcf_v15.git
git://git.eclipse.org/gitroot/titan/titan.ProtocolModules.5G_system_TS29518_Namf_v15.git
git://git.eclipse.org/gitroot/titan/titan.ProtocolModules.5G_system_TS29520_Nnwdaf_v15.git
git://git.eclipse.org/gitroot/titan/titan.ProtocolModules.5G_system_TS29571_CommonData_v15.git
git://git.eclipse.org/gitroot/titan/titan.ProtocolModules.5G_system_TS29572_Nlmf_v15.git
git://git.eclipse.org/gitroot/titan/titan.ProtocolModules.5G_system_TS29594_Nchf_v15.git
git://git.eclipse.org/gitroot/titan/titan.ProtocolModules.5G_system_TS32291_Nchf_v15.git
git://git.eclipse.org/gitroot/titan/titan.ProtocolModules.BSSAPP_v7.3.0.git
git://git.eclipse.org/gitroot/titan/titan.ProtocolModules.BSSGP_v13.0.0.git
git://git.eclipse.org/gitroot/titan/titan.ProtocolModules.BSSMAP_v11.2.0.git
git://git.eclipse.org/gitroot/titan/titan.ProtocolModules.CoAP.git
git://git.eclipse.org/gitroot/titan/titan.ProtocolModules.DSS1_ETSI.git
git://git.eclipse.org/gitroot/titan/titan.ProtocolModules.DUA.git
git://git.eclipse.org/gitroot/titan/titan.ProtocolModules.EAP.git
git://git.eclipse.org/gitroot/titan/titan.ProtocolModules.GCP_31r1.git
git://git.eclipse.org/gitroot/titan/titan.ProtocolModules.GRE.git
git://git.eclipse.org/gitroot/titan/titan.ProtocolModules.GTP_v13.5.0.git
git://git.eclipse.org/gitroot/titan/titan.ProtocolModules.GTPv2_v13.7.0.git
git://git.eclipse.org/gitroot/titan/titan.ProtocolModules.GTPv2_v15.2.0.git
git://git.eclipse.org/gitroot/titan/titan.ProtocolModules.HTTP2.git
git://git.eclipse.org/gitroot/titan/titan.ProtocolModules.ISUP_Q.762.git
git://git.eclipse.org/gitroot/titan/titan.ProtocolModules.JSON_Generic.git
git://git.eclipse.org/gitroot/titan/titan.ProtocolModules.LLC_v7.1.0.git
git://git.eclipse.org/gitroot/titan/titan.ProtocolModules.M2PA.git
git://git.eclipse.org/gitroot/titan/titan.ProtocolModules.M2UA.git
git://git.eclipse.org/gitroot/titan/titan.ProtocolModules.MobileL3_v13.4.0.git
git://git.eclipse.org/gitroot/titan/titan.ProtocolModules.MongoDB.git
git://git.eclipse.org/gitroot/titan/titan.ProtocolModules.MQTT.git
git://git.eclipse.org/gitroot/titan/titan.ProtocolModules.NAS_EPS_15.2.0.1.git
git://git.eclipse.org/gitroot/titan/titan.ProtocolModules.NDP.git
git://git.eclipse.org/gitroot/titan/titan.ProtocolModules.NS_v7.3.0.git
git://git.eclipse.org/gitroot/titan/titan.ProtocolModules.NTAF.git
git://git.eclipse.org/gitroot/titan/titan.ProtocolModules.OPC_UA.git
git://git.eclipse.org/gitroot/titan/titan.ProtocolModules.PFCP_v15.1.0.git
git://git.eclipse.org/gitroot/titan/titan.ProtocolModules.ROSE.git
git://git.eclipse.org/gitroot/titan/titan.ProtocolModules.SCTP.git
git://git.eclipse.org/gitroot/titan/titan.ProtocolModules.SDP.git
git://git.eclipse.org/gitroot/titan/titan.ProtocolModules.SGsAP_13.2.0.git
git://git.eclipse.org/gitroot/titan/titan.ProtocolModules.SNDCP_v7.0.0.git
git://git.eclipse.org/gitroot/titan/titan.ProtocolModules.STOMP.git
git://git.eclipse.org/gitroot/titan/titan.ProtocolModules.STUN.git
git://git.eclipse.org/gitroot/titan/titan.ProtocolModules.STUN_RFC5389.git
git://git.eclipse.org/gitroot/titan/titan.ProtocolModules.SUA.git
git://git.eclipse.org/gitroot/titan/titan.ProtocolModules.TLS.git
git://git.eclipse.org/gitroot/titan/titan.ProtocolModules.V5.git
git://git.eclipse.org/gitroot/titan/titan.ProtocolModules.WTP.git
git://git.eclipse.org/gitroot/titan/titan.ProtocolModules.XML_RPC.git
git://git.eclipse.org/gitroot/titan/titan.ProtocolModules.XTDP.git
git://git.eclipse.org/gitroot/titan/titan.Servers.GTP_Tunnel_Daemon.git
git://git.eclipse.org/gitroot/titan/titan.Servers.IP_Daemon_Dynamic.git
git://git.eclipse.org/gitroot/titan/titan.Servers.SCTP_Daemon_Dynamic.git
git://git.eclipse.org/gitroot/titan/titan.TestPorts.GPIO.git
git://git.eclipse.org/gitroot/titan/titan.TestPorts.MTP3asp.git
git://git.eclipse.org/gitroot/titan/titan.TestPorts.Serial.git
git://git.eclipse.org/gitroot/titan/titan.TestPorts.SocketCANasp.git
git://git.eclipse.org/gitroot/titan/titan.TestPorts.Thrift_TPG.git
......@@ -53,6 +53,7 @@ ifneq ($(filter dmalloc, $(packages)),)
endif
ifneq ($(filter thread, $(packages)),)
cflags += -pthread
defines += USE_THREADS
libs += -lpthread
endif
......@@ -79,6 +80,11 @@ ifneq ($(filter openssl, $(packages)),)
endif
endif
ifneq ($(filter googletest, $(packages)),)
includes += /usr/local/include
libs += -L/usr/local/lib -lgtest -lgtest_main
endif
ifneq ($(filter cxml, $(packages)),)
predirs += $(PROJECTROOT)/cxml
endif
......
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