Unify STF525 TTCN-3 code (44d1384d) · Commits · ITS - Intelligent Transport Systems / ITS

.TITAN_properties

+9 −2

Original line number	Diff line number	Diff line
		@@ -134,14 +134,14 @@
		</FolderProperties>
		</FolderResource>
		<FolderResource>
		<FolderPath>ttcn/AtsIICP</FolderPath>
		<FolderPath>ttcn/AtsGenCert</FolderPath>
		<FolderProperties>
		<CentralStorage>false</CentralStorage>
		<ExcludeFromBuild>true</ExcludeFromBuild>
		</FolderProperties>
		</FolderResource>
		<FolderResource>
		<FolderPath>ttcn/AtsIPv6OverGeoNetworking</FolderPath>
		<FolderPath>ttcn/AtsIICP</FolderPath>
		<FolderProperties>
		<CentralStorage>false</CentralStorage>
		<ExcludeFromBuild>true</ExcludeFromBuild>
		@@ -273,6 +273,13 @@
		<ExcludeFromBuild>true</ExcludeFromBuild>
		</FolderProperties>
		</FolderResource>
		<FolderResource>
		<FolderPath>ttcn/TestCodec</FolderPath>
		<FolderProperties>
		<CentralStorage>false</CentralStorage>
		<ExcludeFromBuild>true</ExcludeFromBuild>
		</FolderProperties>
		</FolderResource>
		</FolderProperties>
		<FileProperties>
		<FileResource>

ttcn/AtsGenCert/ItsGenCert_Functions.ttcn

+5 −5

Original line number	Diff line number	Diff line
		@@ -24,9 +24,9 @@ module ItsGenCert_Functions {
		if (p_certificate_params.curve == e_nist_p256) {
		f_generate_key_pair_nistp256(p_certificate_details.private_key, p_certificate_details.public_key_x, p_certificate_details.public_key_y, p_certificate_details.public_key_compressed, p_certificate_details.public_key_compressed_mode);
		} else if (p_certificate_params.curve == e_brainpool_p256) {
		f_generate_key_pair_brainpoolp256(p_certificate_details.private_key, p_certificate_details.public_key_x, p_certificate_details.public_key_y, p_certificate_details.public_key_compressed, p_certificate_details.public_key_compressed_mode);
		f_generate_key_pair_brainpoolp256r1(p_certificate_details.private_key, p_certificate_details.public_key_x, p_certificate_details.public_key_y, p_certificate_details.public_key_compressed, p_certificate_details.public_key_compressed_mode);
		} else if (p_certificate_params.curve == e_brainpool_p384) {
		f_generate_key_pair_brainpoolp384(p_certificate_details.private_key, p_certificate_details.public_key_x, p_certificate_details.public_key_y, p_certificate_details.public_key_compressed, p_certificate_details.public_key_compressed_mode);
		f_generate_key_pair_brainpoolp384r1(p_certificate_details.private_key, p_certificate_details.public_key_x, p_certificate_details.public_key_y, p_certificate_details.public_key_compressed, p_certificate_details.public_key_compressed_mode);
		} else {
		log("f_generate_signing_keys: Unsupported curve");
		return -1;
		@@ -36,7 +36,7 @@ module ItsGenCert_Functions {
		if (p_certificate_params.encryption_curve == e_nist_p256) {
		f_generate_key_pair_nistp256(p_certificate_details.private_enc_key, p_certificate_details.public_enc_key_x, p_certificate_details.public_enc_key_y, p_certificate_details.public_enc_key_compressed, p_certificate_details.public_enc_key_compressed_mode);
		} else if (p_certificate_params.encryption_curve == e_brainpool_p256) {
		f_generate_key_pair_brainpoolp256(p_certificate_details.private_enc_key, p_certificate_details.public_enc_key_x, p_certificate_details.public_enc_key_y, p_certificate_details.public_enc_key_compressed, p_certificate_details.public_enc_key_compressed_mode);
		f_generate_key_pair_brainpoolp256r1(p_certificate_details.private_enc_key, p_certificate_details.public_enc_key_x, p_certificate_details.public_enc_key_y, p_certificate_details.public_enc_key_compressed, p_certificate_details.public_enc_key_compressed_mode);
		} else {
		log("f_generate_signing_keys: Unsupported encryption curve");
		return -1;
		@@ -273,10 +273,10 @@ module ItsGenCert_Functions {
		// Calculate the whole HashedId8 as defined in IEEE Std 1609.2-20XX Clause 6.4.3 CertificateBase
		if (p_certificate_params.hash_algorithm == sha256) {
		p_certificate_details.hash := f_hashWithSha256(p_certificate_details.enc_cert); // Hash of the whole certificate
		p_certificate_details.hashid8 := f_HashedId8FromSha256(p_certificate_details.hash);
		p_certificate_details.hashid8 := f_hashedId8FromSha256(p_certificate_details.hash);
		} else {
		p_certificate_details.hash := f_hashWithSha384(p_certificate_details.enc_cert); // Hash of the whole certificate
		p_certificate_details.hashid8 := f_HashedId8FromSha384(p_certificate_details.hash);
		p_certificate_details.hashid8 := f_hashedId8FromSha384(p_certificate_details.hash);
		}
		if (p_certificate_params.certificate_id == p_certificate_params.signed_by) { // Root certificate
		log("f_finalyse_certificate: Root certificate");

ttcn/AtsGenCert/ItsGenCert_TestCases.ttcn

+2 −1

Original line number	Diff line number	Diff line
		@@ -127,6 +127,7 @@ module ItsGencert_TestCases {
		}
		} else {
		var EtsiTs103097Certificate v_issuing_certificate;
		var charstring v_certificate_id;
		var HashedId8 v_issuer;

		if (ischosen(v_certificate.issuer.sha256AndDigest)) {
		@@ -137,7 +138,7 @@ module ItsGencert_TestCases {
		setverdict(fail, "Unsupported issuer");
		stop;
		}
		if (f_getCertificateFromDigest(v_issuer, v_issuing_certificate) == false) {
		if (f_getCertificateFromDigest(v_issuer, v_issuing_certificate, v_certificate_id) == false) {
		setverdict(fail, "Failed to get certificate from digest ", v_issuer);
		stop;
		}

ttcn/AtsIPv6OverGeoNetworking/ItsIpv6OverGeoNetworking_TestCases.ttcn

+56 −56

Original line number	Diff line number	Diff line
		/**
		* @author ETSI / STF405 / STF449
		* @version $URL$
		* $Id$
		* @version $Url: https://oldforge.etsi.org/svn/ITS/tags/20170222_STF527_Final/ttcn/AtsIPv6OverGeoNetworking/ItsIpv6OverGeoNetworking_TestCases.ttcn $
		* $Id: ItsIpv6OverGeoNetworking_TestCases.ttcn 2655 2017-01-26 10:46:08Z filatov $
		* @desc Testcases for IPv6 over GeoNetworking Protocol (TP version: 0.0.4)
		*
		*/
		module ItsIpv6OverGeoNetworking_TestCases {

		// LibCommon
		// import from LibCommon_BasicTypesAndValues all;
		import from LibCommon_BasicTypesAndValues all;
		import from LibCommon_Sync all;
		import from LibCommon_Time all;
		// import from LibCommon_VerdictControl all;
		import from LibCommon_VerdictControl all;
		import from LibCommon_Time all;

		// LibIts
		@@ -118,7 +118,7 @@ module ItsIpv6OverGeoNetworking_TestCases {
		)
		)
		),
		mw_ipv6Payload(v_ipv6Packet)
		bit2oct(encvalue(v_ipv6Packet))
		)
		) {
		tc_ac.stop;
		@@ -225,7 +225,7 @@ module ItsIpv6OverGeoNetworking_TestCases {
		)
		)
		),
		mw_ipv6Payload(v_ipv6Packet)
		bit2oct(encvalue(v_ipv6Packet))
		)
		) {
		tc_ac.stop;
		@@ -331,7 +331,7 @@ module ItsIpv6OverGeoNetworking_TestCases {
		)
		)
		),
		mw_ipv6Payload(v_ipv6Packet)
		bit2oct(encvalue(v_ipv6Packet))
		)
		) {
		tc_ac.stop;
		@@ -443,7 +443,7 @@ module ItsIpv6OverGeoNetworking_TestCases {
		)
		)
		),
		mw_ipv6Payload(v_ipv6Packet)
		bit2oct(encvalue(v_ipv6Packet))
		)
		) {
		tc_ac.stop;
		@@ -461,7 +461,7 @@ module ItsIpv6OverGeoNetworking_TestCases {
		)
		)
		),
		mw_ipv6Payload(v_ipv6Packet)
		bit2oct(encvalue(v_ipv6Packet))
		)
		) {
		tc_ac.stop;
		@@ -574,7 +574,7 @@ module ItsIpv6OverGeoNetworking_TestCases {
		)
		)
		),
		mw_ipv6Payload(v_ipv6Packet)
		bit2oct(encvalue(v_ipv6Packet))
		)
		) {
		tc_ac.stop;
		@@ -592,7 +592,7 @@ module ItsIpv6OverGeoNetworking_TestCases {
		)
		)
		),
		mw_ipv6Payload(v_ipv6Packet)
		bit2oct(encvalue(v_ipv6Packet))
		)
		) {
		tc_ac.stop;
		@@ -712,7 +712,7 @@ module ItsIpv6OverGeoNetworking_TestCases {
		)
		)
		),
		mw_ipv6Payload(v_ipv6Packet)
		bit2oct(encvalue(v_ipv6Packet))
		)
		) {
		tc_ac.stop;
		@@ -730,7 +730,7 @@ module ItsIpv6OverGeoNetworking_TestCases {
		)
		)
		),
		mw_ipv6Payload(v_ipv6Packet)
		bit2oct(encvalue(v_ipv6Packet))
		)
		) {
		tc_ac.stop;
		@@ -845,7 +845,7 @@ module ItsIpv6OverGeoNetworking_TestCases {
		)
		)
		),
		mw_ipv6Payload(v_ipv6Packet)
		bit2oct(encvalue(v_ipv6Packet))
		)
		) {
		tc_ac.stop;
		@@ -863,7 +863,7 @@ module ItsIpv6OverGeoNetworking_TestCases {
		)
		)
		),
		mw_ipv6Payload(v_ipv6Packet)
		bit2oct(encvalue(v_ipv6Packet))
		)
		) {
		tc_ac.stop;
		@@ -972,7 +972,7 @@ module ItsIpv6OverGeoNetworking_TestCases {
		)
		)
		),
		mw_ipv6Payload(v_ipv6Packet)
		bit2oct(encvalue(v_ipv6Packet))
		)
		) {
		tc_ac.stop;
		@@ -990,7 +990,7 @@ module ItsIpv6OverGeoNetworking_TestCases {
		)
		)
		),
		mw_ipv6Payload(v_ipv6Packet)
		bit2oct(encvalue(v_ipv6Packet))
		)
		) {
		tc_ac.stop;
		@@ -1084,7 +1084,7 @@ module ItsIpv6OverGeoNetworking_TestCases {

		// Test Body
		f_sendGeoNetMessageWithPayload(
		valueof(m_geoNwReq_linkLayerBroadcast(
		m_geoNwReq_linkLayerBroadcast(
		m_geoNwPdu(
		m_geoNwBroadcastPacket(
		v_longPosVectorNodeA,
		@@ -1092,8 +1092,8 @@ module ItsIpv6OverGeoNetworking_TestCases {
		f_getGeoBroadcastArea(vc_gvlTable[c_gvl1].area)
		)
		)
		)),
		m_ipv6Payload(v_ipv6Packet)
		),
		bit2oct(encvalue(v_ipv6Packet))
		);

		tc_ac.start;
		@@ -1190,7 +1190,7 @@ module ItsIpv6OverGeoNetworking_TestCases {

		// Test Body
		f_sendGeoNetMessageWithPayload(
		valueof(m_geoNwReq_linkLayerBroadcast(
		m_geoNwReq_linkLayerBroadcast(
		m_geoNwPdu(
		m_geoNwBroadcastPacket(
		v_longPosVectorNodeA,
		@@ -1198,8 +1198,8 @@ module ItsIpv6OverGeoNetworking_TestCases {
		f_getGeoBroadcastArea(vc_gvlTable[c_gvl2].area)
		)
		)
		)),
		m_ipv6Payload(v_ipv6Packet)
		),
		bit2oct(encvalue(v_ipv6Packet))
		);

		tc_ac.start;
		@@ -1289,7 +1289,7 @@ module ItsIpv6OverGeoNetworking_TestCases {

		// Test Body
		f_sendGeoNetMessageWithPayload(
		valueof(m_geoNwReq_linkLayerBroadcast(
		m_geoNwReq_linkLayerBroadcast(
		m_geoNwPdu(
		m_geoNwAnycastPacket(
		v_longPosVectorNodeA,
		@@ -1297,8 +1297,8 @@ module ItsIpv6OverGeoNetworking_TestCases {
		f_getGeoAnycastArea(vc_gvlTable[c_gvl1].area)
		)
		)
		)),
		m_ipv6Payload(v_ipv6Packet)
		),
		bit2oct(encvalue(v_ipv6Packet))
		);

		tc_ac.start;
		@@ -1394,7 +1394,7 @@ module ItsIpv6OverGeoNetworking_TestCases {

		// Test Body
		f_sendGeoNetMessageWithPayload(
		valueof(m_geoNwReq_linkLayerBroadcast(
		m_geoNwReq_linkLayerBroadcast(
		m_geoNwPdu(
		m_geoNwBroadcastPacket(
		v_longPosVectorNodeA,
		@@ -1402,8 +1402,8 @@ module ItsIpv6OverGeoNetworking_TestCases {
		f_getGeoBroadcastArea(vc_gvlTable[c_gvl1].area)
		)
		)
		)),
		m_ipv6Payload(v_ipv6Packet)
		),
		bit2oct(encvalue(v_ipv6Packet))
		);

		tc_ac.start;
		@@ -1507,7 +1507,7 @@ module ItsIpv6OverGeoNetworking_TestCases {

		// Test Body
		f_sendGeoNetMessageWithPayload(
		valueof(m_geoNwReq_linkLayerBroadcast(
		m_geoNwReq_linkLayerBroadcast(
		m_geoNwPdu(
		m_geoNwBroadcastPacket(
		v_longPosVectorNodeA,
		@@ -1515,8 +1515,8 @@ module ItsIpv6OverGeoNetworking_TestCases {
		f_getGeoBroadcastArea(vc_gvlTable[c_gvl3].area)
		)
		)
		)),
		m_ipv6Payload(v_ipv6Packet)
		),
		bit2oct(encvalue(v_ipv6Packet))
		);

		f_sleep(PX_T_BUILD_CONFIG);
		@@ -1614,7 +1614,7 @@ module ItsIpv6OverGeoNetworking_TestCases {

		// Test Body
		f_sendGeoNetMessageWithPayload(
		valueof(m_geoNwReq_linkLayerBroadcast(
		m_geoNwReq_linkLayerBroadcast(
		m_geoNwPdu(
		m_geoNwUnicastPacket(
		v_longPosVectorNodeA,
		@@ -1622,8 +1622,8 @@ module ItsIpv6OverGeoNetworking_TestCases {
		vc_localSeqNumber
		)
		)
		)),
		m_ipv6Payload(v_ipv6Packet)
		),
		bit2oct(encvalue(v_ipv6Packet))
		);

		tc_ac.start;
		@@ -1722,7 +1722,7 @@ module ItsIpv6OverGeoNetworking_TestCases {

		// Test Body
		f_sendGeoNetMessageWithPayload(
		valueof(m_geoNwReq_linkLayerBroadcast(
		m_geoNwReq_linkLayerBroadcast(
		m_geoNwPdu(
		m_geoNwUnicastPacket(
		v_longPosVectorNodeB,
		@@ -1730,8 +1730,8 @@ module ItsIpv6OverGeoNetworking_TestCases {
		vc_localSeqNumber
		)
		)
		)),
		m_ipv6Payload(v_ipv6Packet)
		),
		bit2oct(encvalue(v_ipv6Packet))
		);

		tc_ac.start;
		@@ -1829,7 +1829,7 @@ module ItsIpv6OverGeoNetworking_TestCases {

		// Test Body
		f_sendGeoNetMessageWithPayload(
		valueof(m_geoNwReq_linkLayerBroadcast(
		m_geoNwReq_linkLayerBroadcast(
		m_geoNwPdu(
		m_geoNwUnicastPacket(
		v_longPosVectorNodeB,
		@@ -1837,8 +1837,8 @@ module ItsIpv6OverGeoNetworking_TestCases {
		vc_localSeqNumber
		)
		)
		)),
		m_ipv6Payload(v_ipv6Packet)
		),
		bit2oct(encvalue(v_ipv6Packet))
		);

		tc_ac.start;
		@@ -1937,7 +1937,7 @@ module ItsIpv6OverGeoNetworking_TestCases {

		// Test Body
		f_sendGeoNetMessageWithPayload(
		valueof(m_geoNwReq_linkLayerBroadcast(
		m_geoNwReq_linkLayerBroadcast(
		m_geoNwPdu(
		m_geoNwUnicastPacket(
		v_longPosVectorNodeB,
		@@ -1945,8 +1945,8 @@ module ItsIpv6OverGeoNetworking_TestCases {
		vc_localSeqNumber
		)
		)
		)),
		m_ipv6Payload(v_ipv6Packet)
		),
		bit2oct(encvalue(v_ipv6Packet))
		);

		tc_ac.start;
		@@ -2047,7 +2047,7 @@ module ItsIpv6OverGeoNetworking_TestCases {

		// Test Body
		f_sendGeoNetMessageWithPayload(
		valueof(m_geoNwReq_linkLayerBroadcast(
		m_geoNwReq_linkLayerBroadcast(
		m_geoNwPdu(
		m_geoNwUnicastPacket(
		v_longPosVectorNodeB,
		@@ -2055,8 +2055,8 @@ module ItsIpv6OverGeoNetworking_TestCases {
		vc_localSeqNumber
		)
		)
		)),
		m_ipv6Payload(v_ipv6Packet)
		),
		bit2oct(encvalue(v_ipv6Packet))
		);

		tc_ac.start;
		@@ -2152,15 +2152,15 @@ module ItsIpv6OverGeoNetworking_TestCases {

		// Test Body
		f_sendGeoNetMessageWithPayload(
		valueof(m_geoNwReq_linkLayerBroadcast(
		m_geoNwReq_linkLayerBroadcast(
		m_geoNwPdu(
		m_geoNwTsbPacket(
		vc_localSeqNumber,
		v_longPosVectorIut
		)
		)
		)),
		m_ipv6Payload(v_ipv6Packet)
		),
		bit2oct(encvalue(v_ipv6Packet))
		);

		tc_ac.start;
		@@ -2265,7 +2265,7 @@ module ItsIpv6OverGeoNetworking_TestCases {

		// Test Body
		f_sendGeoNetMessageWithPayload(
		valueof(m_geoNwReq_linkLayerBroadcast(
		m_geoNwReq_linkLayerBroadcast(
		m_geoNwPdu(
		m_geoNwBroadcastPacket(
		v_longPosVectorNodeA,
		@@ -2273,8 +2273,8 @@ module ItsIpv6OverGeoNetworking_TestCases {
		f_getGeoBroadcastArea(vc_gvlTable[c_gvl3].area)
		)
		)
		)),
		m_ipv6Payload(v_ipv6Packet)
		),
		bit2oct(encvalue(v_ipv6Packet))
		);

		f_sleep(PX_T_BUILD_CONFIG);
		@@ -2360,7 +2360,7 @@ module ItsIpv6OverGeoNetworking_TestCases {
		);

		f_sendGeoNetMessageWithPayload(
		valueof(m_geoNwReq_linkLayerBroadcast(
		m_geoNwReq_linkLayerBroadcast(
		m_geoNwPdu(
		m_geoNwBroadcastPacket(
		v_longPosVectorNodeA,
		@@ -2368,8 +2368,8 @@ module ItsIpv6OverGeoNetworking_TestCases {
		f_getGeoBroadcastArea(vc_gvlTable[c_gvl3].area)
		)
		)
		)),
		m_ipv6Payload(v_ipv6Packet)
		),
		bit2oct(encvalue(v_ipv6Packet))
		);

		f_sleep(PX_T_BUILD_CONFIG);

ttcn/AtsIPv6OverGeoNetworking/ItsIpv6OverGeoNetworking_TestControl.ttcn

+2 −2

Original line number	Diff line number	Diff line
		/**
		* @author ETSI / STF405 /STF449
		* @version $URL$
		* $Id$
		* @version $Url: https://oldforge.etsi.org/svn/ITS/tags/20170222_STF527_Final/ttcn/AtsIPv6OverGeoNetworking/ItsIpv6OverGeoNetworking_TestControl.ttcn $
		* $Id: ItsIpv6OverGeoNetworking_TestControl.ttcn 1423 2014-05-22 13:59:50Z filatov $
		* @desc Test Control file for IPv6 over GeoNetworking Protocol
		*
		*/