Merge remote-tracking branch 'origin/master' into devel (11f43d7a) · Commits · ITS - Intelligent Transport Systems / ITS Test Suite

.jenkins.sh

+11 −1

Original line number	Diff line number	Diff line
		@@ -12,6 +12,14 @@ run_dir=`pwd`
		# Docker version 2
		cd ./virtualization/docker
		./build.sh #--force-stfubuntu
		ret_code=`echo $?`

		if [ $ret_code != 0 ]
		then
		cd $run_dir
		exit -1
		fi

		#./run.sh

		if [ "$1" == "--remove" ]
		@@ -19,4 +27,6 @@ then
		docker rmi --force etsiforge/etsi-its-ts:latest
		fi

		cd -
		cd $run_dir

		exit 0

TTF011_win.tpd→TS.ITS.tpd

+5 −5

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="UTF-8"?><TITAN_Project_File_Information version="1.0">
		\0;136;0c<?xml version="1.0" encoding="UTF-8"?><TITAN_Project_File_Information version="1.0">
		<!--
		Copyright (c) 2000-2020 Ericsson Telecom AB
		All rights reserved. This program and the accompanying materials
		@@ -6,7 +6,7 @@
		which accompanies this distribution, and is available at
		https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.html
		-->
		<ProjectName>TTF011_Its</ProjectName>
		<ProjectName>TS.ITS</ProjectName>
		<ReferencedProjects>
		<ReferencedProject name="Abstract_Socket_CNL113384" projectLocationURI="../../../../../cygwin64/home/yanng/frameworks/titan/titan.TestPorts.Common_Components.Abstract_Socket/Abstract_Socket_CNL113384.tpd"/>
		</ReferencedProjects>
		@@ -201,8 +201,8 @@
		<FileResource projectRelativePath="LICENSE" relativeURI="LICENSE"/>
		<FileResource projectRelativePath="Makefile" relativeURI="Makefile"/>
		<FileResource projectRelativePath="README.md" relativeURI="README.md"/>
		<FileResource projectRelativePath="TTF011.tpd" relativeURI="TTF011.tpd"/>
		<FileResource projectRelativePath="TTF011_win.tpd" relativeURI="TTF011_win.tpd"/>
		<FileResource projectRelativePath="TS.ITS.tpd" relativeURI="TS.ITS.tpd"/>
		<FileResource projectRelativePath="TS.ITS_win.tpd" relativeURI="TS.ITS_win.tpd"/>
		<FileResource projectRelativePath="asn1/Makefile" relativeURI="asn1/Makefile"/>
		<FileResource projectRelativePath="asn1/PsidGroupPermissions.c.diff" relativeURI="asn1/PsidGroupPermissions.c.diff"/>
		<FileResource projectRelativePath="asn1c_cert.tar.bz2" relativeURI="asn1c_cert.tar.bz2"/>

ccsrc/Externals/LibItsCommon_externals.cc

+1 −1

Original line number	Diff line number	Diff line
		@@ -25,7 +25,7 @@ namespace LibItsCommon__Functions {
		}
		/**
		* @desc This external function gets the current time since 01/01/1970 in UTC format
		* @return The current time since 01/01/1970 in UTC format
		* @return The current time since 01/01/1970 in UTC format in milliseconds
		* @see fx_getCurrentTimeUtc() return UInt64
		*/
		INTEGER fx__getCurrentTimeUtc() {

ccsrc/Externals/LibItsSecurity_externals.cc

+2 −2

Original line number	Diff line number	Diff line
		@@ -693,7 +693,7 @@ namespace LibItsSecurity__Functions {
		p__publicEphemeralKeyCompressed = ec->public_key_compressed();
		loggers::get_instance().log_msg("fx__encryptWithEciesNistp256WithSha256: Ephemeral public compressed key: ", p__publicEphemeralKeyCompressed);
		p__ephemeralCompressedMode = (ec->public_key_compressed_mode() == ecc_compressed_mode::compressed_y_0) ? 0 : 1;
		loggers::get_instance().log("fx__encryptWithEciesNistp256WithSha256: Ephemeral public compressed mode: %d: ", p__ephemeralCompressedMode);
		loggers::get_instance().log("fx__encryptWithEciesNistp256WithSha256: Ephemeral public compressed mode: %d: ", (int)p__ephemeralCompressedMode);
		// 3. Retrieve AES 128 parameters
		p__nonce = ec->nonce();
		loggers::get_instance().log_msg("fx__encryptWithEciesNistp256WithSha256: p__nonce: ", p__nonce);
		@@ -858,7 +858,7 @@ namespace LibItsSecurity__Functions {
		p__publicEphemeralKeyCompressed = ec->public_key_compressed();
		loggers::get_instance().log_msg("fx__encryptWithEciesBrainpoolp256r1WithSha256: Ephemeral public compressed key: ", p__publicEphemeralKeyCompressed);
		p__ephemeralCompressedMode = (ec->public_key_compressed_mode() == ecc_compressed_mode::compressed_y_0) ? 0 : 1;
		loggers::get_instance().log("fx__encryptWithEciesBrainpoolp256r1WithSha256: Ephemeral public compressed mode: %d: ", p__ephemeralCompressedMode);
		loggers::get_instance().log("fx__encryptWithEciesBrainpoolp256r1WithSha256: Ephemeral public compressed mode: %d: ", (int)p__ephemeralCompressedMode);
		// 3. Retrieve AES 128 parameters
		p__nonce = ec->nonce();
		loggers::get_instance().log_msg("fx__encryptWithEciesBrainpoolp256r1WithSha256: p__nonce: ", p__nonce);

ccsrc/Protocols/Http/http_codec.cc

+9 −2

Original line number	Diff line number	Diff line
		@@ -417,8 +417,15 @@ int http_codec::encode_body(const LibItsHttp__MessageBodyTypes::HttpMessageBody
		it = _codecs.find("http_its"); // TODO Use params
		if (it != _codecs.cend()) {
		loggers::get_instance().log("http_codec::encode_body: Call '%s'", it->first.c_str());
		if (binary_body.ischosen(LibItsHttp__BinaryMessageBodyTypes::BinaryBody::ALT_ieee1609dot2__data)) {
		_codecs["http_its"]->encode((Record_Type &)binary_body.ieee1609dot2__data(), p_encoding_buffer); // TODO Use params
		processed = true;
		} else if (binary_body.ischosen(LibItsHttp__BinaryMessageBodyTypes::BinaryBody::ALT_ieee1609dot2__certificate)) {
		_codecs["http_its"]->encode((Record_Type &)binary_body.ieee1609dot2__certificate(), p_encoding_buffer); // TODO Use params
		processed = true;
		} else {
		loggers::get_instance().warning("http_codec::encode_body: Unsupported variant");
		}
		}
		} // TODO Add new HTTP message codec here
		if (!processed) {