From 68adc9bad5e2d9ad035d2a0344a486c41a44dd06 Mon Sep 17 00:00:00 2001 From: YannGarcia Date: Thu, 30 Jan 2020 10:32:46 +0100 Subject: [PATCH] Minor bug fixed --- ccsrc/Protocols/Security/security_ecc.cc | 10 +- etc/AtsPki/AtsPki.cfg | 14 +-- scripts/cam_generate_makefile.bash | 0 scripts/denm_generate_makefile.bash | 0 scripts/geonw_generate_makefile.bash | 0 scripts/security_generate_makefile.bash | 0 scripts/titan_repos.txt | 115 ++++++++++++++++++++--- 7 files changed, 115 insertions(+), 24 deletions(-) mode change 100644 => 100755 scripts/cam_generate_makefile.bash mode change 100644 => 100755 scripts/denm_generate_makefile.bash mode change 100644 => 100755 scripts/geonw_generate_makefile.bash mode change 100644 => 100755 scripts/security_generate_makefile.bash diff --git a/ccsrc/Protocols/Security/security_ecc.cc b/ccsrc/Protocols/Security/security_ecc.cc index 44f466262..ed1518753 100644 --- a/ccsrc/Protocols/Security/security_ecc.cc +++ b/ccsrc/Protocols/Security/security_ecc.cc @@ -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(_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(_enc_sym_key), _enc_sym_key.lengthof(), static_cast(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; diff --git a/etc/AtsPki/AtsPki.cfg b/etc/AtsPki/AtsPki.cfg index 0d0fbcf9f..5b43e5c56 100644 --- a/etc/AtsPki/AtsPki.cfg +++ b/etc/AtsPki/AtsPki.cfg @@ -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. diff --git a/scripts/cam_generate_makefile.bash b/scripts/cam_generate_makefile.bash old mode 100644 new mode 100755 diff --git a/scripts/denm_generate_makefile.bash b/scripts/denm_generate_makefile.bash old mode 100644 new mode 100755 diff --git a/scripts/geonw_generate_makefile.bash b/scripts/geonw_generate_makefile.bash old mode 100644 new mode 100755 diff --git a/scripts/security_generate_makefile.bash b/scripts/security_generate_makefile.bash old mode 100644 new mode 100755 diff --git a/scripts/titan_repos.txt b/scripts/titan_repos.txt index 3a2058cc0..98f1a2177 100644 --- a/scripts/titan_repos.txt +++ b/scripts/titan_repos.txt @@ -1,10 +1,12 @@ 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 -- GitLab