Bug fixed in http_codec (4aa661c7) · Commits · ITS - Intelligent Transport Systems / ITS

ccsrc/Protocols/Http/http_codec.cc

+2 −0

Original line number	Diff line number	Diff line
		@@ -12,6 +12,8 @@
		#include "LibItsHttp_MessageBodyTypes.hh"
		#include "LibItsHttp_XmlMessageBodyTypes.hh"

		#include "http_etsi_ieee1609dot2_codec.hh"

		int http_codec::encode (const LibItsHttp__TypesAndValues::HttpMessage& msg, OCTETSTRING& data)
		{
		loggers::get_instance().log_msg(">>> http_codec::encode: ", (const Base_Type&)msg);

etc/AtsPki/AtsPki.cfg

+2 −3

Original line number	Diff line number	Diff line
		@@ -143,9 +143,8 @@ system.utPort.params := "UT_PKI/UDP(dst_ip=172.23.0.1,dst_port=8000)"
		#ItsPki_TestCases.TC_SEC_PKI_SND_EA_BV_10
		#ItsPki_TestCases.TC_SEC_PKI_SND_EA_BV_11
		#ItsPki_TestCases.TC_SEC_PKI_SND_EA_BV_12

		ItsPki_TestCases.TC_SEC_PKI_SND_AA_BV_00

		#ItsPki_TestCases.TC_SEC_PKI_SND_EA_AA_BV_01
		ItsPki_TestCases.TC_SEC_PKI_SND_AA_BV_01

		[MAIN_CONTROLLER]
		# The options herein control the behavior of MC.

ttcn/AtsPki/ItsPki_Functions.ttcn

deleted100644 → 0

+0 −14

Original line number	Diff line number	Diff line
		/**
		* @author ETSI / STF544
		* @version $URL$
		* $Id$
		* @desc Module containing functions for ITS PKI ATS
		* @copyright ETSI Copyright Notification
		* No part may be reproduced except as authorized by written permission.
		* The copyright and the foregoing restriction extend to reproduction in all media.
		* All rights reserved.
		*
		*/
		module ItsPki_Functions {

		} // End of module ItsPki_Functions

ttcn/AtsPki/ItsPki_TestCases.ttcn

+34 −29

Original line number	Diff line number	Diff line
		@@ -818,11 +818,11 @@ module ItsPki_TestCases {
		log("* " & testcasename() & ": LOG: Receive ", v_etsi_ts_102941_data, " *");
		log("* " & testcasename() & ": DEBUG: match ", match(v_etsi_ts_102941_data.content, mw_enrolmentResponse(mw_innerEcResponse_ok(substr(v_request_hash, 0, 16)))), " *"); // TODO In TITAN, this is the only way to get the unmatching in log
		if (match(v_etsi_ts_102941_data.content, mw_enrolmentResponse(mw_innerEcResponse_ok(substr(v_request_hash, 0, 16))))) {
		if (f_verify_ea_certificate(v_etsi_ts_102941_data.content.enrolmentResponse.certificate, v_public_compressed_key, v_compressed_mode)) {
		if (f_verify_ec_certificate(v_etsi_ts_102941_data.content.enrolmentResponse.certificate, v_public_compressed_key, v_compressed_mode)) {
		log("* " & testcasename() & ": PASS: Well-secured EA certificate received *");
		f_selfOrClientSyncAndVerdictTestBody(c_tbDone, e_success);
		} else {
		log("* " & testcasename() & ": FAIL: Cannot verify EA certificate signature *");
		log("* " & testcasename() & ": FAIL: Cannot verify EC certificate signature *");
		f_selfOrClientSyncAndVerdictTestBody(c_tbDone, e_error);
		}
		} else {
		@@ -931,7 +931,7 @@ module ItsPki_TestCases {
		log("* " & testcasename() & ": LOG: Receive ", v_etsi_ts_102941_data, " *");
		log("* " & testcasename() & ": DEBUG: match ", match(v_etsi_ts_102941_data.content, mw_enrolmentResponse(mw_innerEcResponse_ok(substr(v_request_hash, 0, 16)))), " *"); // TODO In TITAN, this is the only way to get the unmatching in log
		if (match(v_etsi_ts_102941_data.content, mw_enrolmentResponse(mw_innerEcResponse_ok(substr(v_request_hash, 0, 16))))) {
		if (f_verify_ea_certificate(v_etsi_ts_102941_data.content.enrolmentResponse.certificate, v_public_compressed_key, v_compressed_mode)) {
		if (f_verify_ec_certificate(v_etsi_ts_102941_data.content.enrolmentResponse.certificate, v_public_compressed_key, v_compressed_mode)) {
		log("* " & testcasename() & ": PASS: Well-secured EA certificate received *");
		f_selfOrClientSyncAndVerdictTestBody(c_tbDone, e_success);
		} else {
		@@ -1043,7 +1043,7 @@ module ItsPki_TestCases {
		log("* " & testcasename() & ": LOG: Receive ", v_etsi_ts_102941_data, " *");
		log("* " & testcasename() & ": DEBUG: match ", match(v_etsi_ts_102941_data.content, mw_enrolmentResponse(mw_innerEcResponse_ok(substr(v_request_hash, 0, 16)))), " *"); // TODO In TITAN, this is the only way to get the unmatching in log
		if (match(v_etsi_ts_102941_data.content, mw_enrolmentResponse(mw_innerEcResponse_ok(substr(v_request_hash, 0, 16))))) {
		if (f_verify_ea_certificate(v_etsi_ts_102941_data.content.enrolmentResponse.certificate, v_public_compressed_key, v_compressed_mode)) {
		if (f_verify_ec_certificate(v_etsi_ts_102941_data.content.enrolmentResponse.certificate, v_public_compressed_key, v_compressed_mode)) {
		log("* " & testcasename() & ": PASS: Well-secured EA certificate received *");
		f_selfOrClientSyncAndVerdictTestBody(c_tbDone, e_success);
		} else {
		@@ -1367,10 +1367,15 @@ module ItsPki_TestCases {
		f_selfOrClientSyncAndVerdictTestBody(c_tbDone, e_error);
		} else {
		log("* " & testcasename() & ": LOG: Receive ", v_etsi_ts_102941_data, " *");
		log("* " & testcasename() & ": DEBUG: match ", match(v_etsi_ts_102941_data.content, mw_enrolmentResponse(mw_innerEcResponse_ok(substr(v_request_hash, 0, 16), mw_etsiTs103097Certificate(mw_issuerIdentifier_self, mw_toBeSignedCertificate_ea, mw_signature_ecdsaNistP256)))), " *"); // TODO In TITAN, this is the only way to get the unmatching in log
		if (match(v_etsi_ts_102941_data.content, mw_enrolmentResponse(mw_innerEcResponse_ok(substr(v_request_hash, 0, 16), mw_etsiTs103097Certificate(mw_issuerIdentifier_self, mw_toBeSignedCertificate_ea, mw_signature_ecdsaNistP256))))) { // TODO Refine mw_signature_ecdsaNistP256
		log("* " & testcasename() & ": DEBUG: match ", match(v_etsi_ts_102941_data.content, mw_enrolmentResponse(mw_innerEcResponse_ok(substr(v_request_hash, 0, 16), mw_etsiTs103097Certificate(-, mw_toBeSignedCertificate_ec, -)))), " *"); // TODO In TITAN, this is the only way to get the unmatching in log
		if (match(v_etsi_ts_102941_data.content, mw_enrolmentResponse(mw_innerEcResponse_ok(substr(v_request_hash, 0, 16), mw_etsiTs103097Certificate(-, mw_toBeSignedCertificate_ec, -))))) {
		if (f_verify_ec_certificate(v_etsi_ts_102941_data.content.enrolmentResponse.certificate, v_public_compressed_key, v_compressed_mode) == true) {
		log("* " & testcasename() & ": PASS: Well-secured EC certificate received *");
		f_selfOrClientSyncAndVerdictTestBody(c_tbDone, e_success);
		} else {
		log("* " & testcasename() & ": FAIL: EC certificate is not proerly formated *");
		f_selfOrClientSyncAndVerdictTestBody(c_tbDone, e_error);
		}
		} else {
		log("* " & testcasename() & ": FAIL: Unexpected message received *");
		f_selfOrClientSyncAndVerdictTestBody(c_tbDone, e_error);
		@@ -1746,6 +1751,7 @@ module ItsPki_TestCases {
		var Oct32 v_private_key_ec;
		var Oct32 v_public_compressed_key_ec;
		var integer v_compressed_mode_ec;
		var InnerEcResponse v_inner_ec_response;
		var Oct32 v_private_key_at;
		var Oct32 v_public_compressed_key_at;
		var integer p_compressed_mode_at;
		@@ -1760,7 +1766,6 @@ module ItsPki_TestCases {
		var octetstring v_salt;
		var Ieee1609Dot2Data v_ieee1609dot2_signed_and_encrypted_data;
		var HeaderLines v_headers;
		var InnerEcResponse v_inner_ec_response;
		var HttpMessage v_response;
		var EtsiTs102941Data v_etsi_ts_102941_data;

		@@ -1779,7 +1784,7 @@ module ItsPki_TestCases {
		// Preamble
		if (f_await_http_inner_ec_request_response(v_private_key_ec, v_public_compressed_key_ec, v_compressed_mode_ec, v_inner_ec_response) == true) {
		log("* " & testcasename() & ": INFO: Enrolment succeed *");
		f_selfOrClientSyncAndVerdictTestBody(c_prDone, e_timeout);
		f_selfOrClientSyncAndVerdictTestBody(c_prDone, e_success);
		} else {
		log("* " & testcasename() & ": INCONC: Enrolment failed *");
		f_selfOrClientSyncAndVerdictTestBody(c_prDone, e_timeout);
		@@ -1787,7 +1792,7 @@ module ItsPki_TestCases {

		// Test Body
		f_http_build_authorization_request(v_inner_ec_response.certificate, v_private_key_ec, v_private_key_at, v_public_compressed_key_at, p_compressed_mode_at, v_private_enc_key_at, v_public_compressed_enc_key_at, v_compressed_enc_mode_at, v_aes_sym_key, v_encrypted_sym_key, v_authentication_vector, v_nonce, v_salt, v_ieee1609dot2_signed_and_encrypted_data, v_request_hash);
		f_set_headears_list({c_header_content_text}, {"authorization_request"}, v_headers);
		f_init_default_headers_list(-, "authorization_request", v_headers);
		httpPort.send(
		m_http_request(
		m_http_request_post(
		@@ -1816,9 +1821,8 @@ module ItsPki_TestCases {
		f_selfOrClientSyncAndVerdictTestBody(c_tbDone, e_error);
		} else {
		log("* " & testcasename() & ": LOG: Receive ", v_etsi_ts_102941_data, " *");
		f_selfOrClientSyncAndVerdictTestBody(c_tbDone, e_success);
		log(match(v_etsi_ts_102941_data.content, mw_authorizationResponse(mw_innerAtResponse_ok(substr(v_request_hash, 0, 16), mw_etsiTs103097Certificate(mw_issuerIdentifier_self, mw_toBeSignedCertificate_ea, mw_signature_ecdsaNistP256))))); // TODO In TITAN, this is the only way to get the unmatching in log
		if (match(v_etsi_ts_102941_data.content, mw_authorizationResponse(mw_innerAtResponse_ok(substr(v_request_hash, 0, 16), mw_etsiTs103097Certificate(mw_issuerIdentifier_self, mw_toBeSignedCertificate_ea, mw_signature_ecdsaNistP256))))) {
		log(match(v_etsi_ts_102941_data.content, mw_authorizationResponse(mw_innerAtResponse_ok(substr(v_request_hash, 0, 16), mw_etsiTs103097Certificate(-, mw_toBeSignedCertificate_ec, -))))); // TODO In TITAN, this is the only way to get the unmatching in log
		if (match(v_etsi_ts_102941_data.content, mw_authorizationResponse(mw_innerAtResponse_ok(substr(v_request_hash, 0, 16), mw_etsiTs103097Certificate(-, mw_toBeSignedCertificate_ec, -))))) {
		// TODO Refined expected mw_signature_ecdsaNistP256
		log("* " & testcasename() & ": PASS: Well-secured AT certificate received *");
		f_selfOrClientSyncAndVerdictTestBody(c_tbDone, e_success);
		@@ -1903,10 +1907,9 @@ module ItsPki_TestCases {
		*/
		testcase TC_SEC_PKI_SND_AA_BV_01() runs on ItsPkiHttp system ItsPkiHttpSystem {
		var Oct32 v_private_key_ec;
		var Oct32 v_public_compressed_key_ec;
		var integer v_compressed_mode_ec;
		var Oct32 v_private_key_at;
		var Oct32 v_public_compressed_key_at;
		var Certificate v_ec_certificate;
		var octetstring v_private_key_at;
		var octetstring v_public_compressed_key_at;
		var integer p_compressed_mode_at;
		var Oct32 v_private_enc_key_at;
		var Oct32 v_public_compressed_enc_key_at;
		@@ -1919,7 +1922,6 @@ module ItsPki_TestCases {
		var octetstring v_salt;
		var Ieee1609Dot2Data v_ieee1609dot2_signed_and_encrypted_data;
		var HeaderLines v_headers;
		var InnerEcResponse v_inner_ec_response;
		var HttpMessage v_response;
		var EtsiTs102941Data v_etsi_ts_102941_data;

		@@ -1936,8 +1938,15 @@ module ItsPki_TestCases {
		// Test adapter configuration

		// Preamble
		f_http_build_inner_ec_request(v_private_key_ec, v_public_compressed_key_ec, v_compressed_mode_ec, v_aes_sym_key, v_encrypted_sym_key, v_authentication_vector, v_nonce, v_salt, v_ieee1609dot2_signed_and_encrypted_data, v_request_hash);
		f_http_build_authorization_request(v_inner_ec_response.certificate, v_private_key_ec, v_private_key_at, v_public_compressed_key_at, p_compressed_mode_at, v_private_enc_key_at, v_public_compressed_enc_key_at, v_compressed_enc_mode_at, v_aes_sym_key, v_encrypted_sym_key, v_authentication_vector, v_nonce, v_salt, v_ieee1609dot2_signed_and_encrypted_data, v_request_hash);
		if (f_generate_ec_certificate(v_private_key_ec, v_ec_certificate) == false) {
		log("* " & testcasename() & ": INCONC: Failed to generate EC certificate *");
		f_selfOrClientSyncAndVerdictPreamble(c_prDone, e_timeout);
		}
		log("* " & testcasename() & ": INFO: Generate EC certificate successful *");
		f_selfOrClientSyncAndVerdictPreamble(c_prDone, e_success);

		// Test Body
		f_http_build_authorization_request(v_ec_certificate, v_private_key_ec, v_private_key_at, v_public_compressed_key_at, p_compressed_mode_at, v_private_enc_key_at, v_public_compressed_enc_key_at, v_compressed_enc_mode_at, v_aes_sym_key, v_encrypted_sym_key, v_authentication_vector, v_nonce, v_salt, v_ieee1609dot2_signed_and_encrypted_data, v_request_hash);
		f_init_default_headers_list(-, "authorization_request", v_headers);
		httpPort.send(
		m_http_request(
		@@ -1948,9 +1957,6 @@ module ItsPki_TestCases {
		m_binary_body_ieee1609dot2_data(
		v_ieee1609dot2_signed_and_encrypted_data
		)))));
		f_selfOrClientSyncAndVerdictPreamble(c_prDone, e_success);

		// Test Body
		tc_ac.start;
		alt {
		[] httpPort.receive(
		@@ -1965,20 +1971,19 @@ module ItsPki_TestCases {
		))))))) -> value v_response {
		tc_ac.stop;

		/*if (f_verify_pki_message(vc_eaPrivateEncKey, vc_eaPeerWholeHash, vc_eaCertificate, v_response.response.body.binary_body.ieee1609dot2_data, false, v_etsi_ts_102941_data, v_request_hash) == false) {
		if (f_verify_pki_message(v_private_key_at, v_aes_sym_key, v_authentication_vector, vc_eaWholeHash, vc_eaCertificate, v_response.response.body.binary_body.ieee1609dot2_data, false, v_etsi_ts_102941_data) == false) {
		log("* " & testcasename() & ": FAIL: Failed to verify PKI message *");
		f_selfOrClientSyncAndVerdictTestBody(c_tbDone, e_error);
		} else {
		log("* " & testcasename() & ": LOG: Receive ", v_etsi_ts_102941_data, " *");
		if (match(v_etsi_ts_102941_data.content, mw_authorizationValidationResponse(mw_authorizationValidationResponse_ok))) {
		// TODO Refined expected mw_authorizationValidationResponse_ok
		log("* " & testcasename() & ": PASS: Well-secured EA certificate received *");
		if (match(v_etsi_ts_102941_data.content, mw_authorizationResponse(mw_innerAtResponse_ok))) {
		log("* " & testcasename() & ": PASS: Well-secured AT certificate received *");
		f_selfOrClientSyncAndVerdictTestBody(c_tbDone, e_success);
		} else {
		log("* " & testcasename() & ": FAIL: Unexpected message received *");
		f_selfOrClientSyncAndVerdictTestBody(c_tbDone, e_error);
		}
		}*/
		}
		}
		[] tc_ac.timeout {
		log("* " & testcasename() & ": INCONC: Expected message not received *");

ttcn/AtsPki/ItsPki_TestSystem.ttcn

deleted100644 → 0

+0 −27

Original line number	Diff line number	Diff line
		/**
		* @author ETSI / STF545
		* @version $URL$
		* $Id$
		* @desc Module containing t fest system description for the ITS PKI ATS
		* @copyright ETSI Copyright Notification
		* No part may be reproduced except as authorized by written permission.
		* The copyright and the foregoing restriction extend to reproduction in all media.
		* All rights reserved.
		*
		*/
		module ItsPki_TestSystem {

		// // LibItsGeoNetworking
		// import from LibItsPki_TestSystem all;
		// import from LibItsGeoNetworking_TestSystem all;
		//
		// type component ItsPkiSystem {
		// port http;
		// } // End of component ItsPkiSystem
		//
		// type component ItsPkiItssSystem {
		// port LibItsGeoNetworking_TestSystem.AdapterControlPort acPort;
		// port GeoNetworkingPort geoNetworkingPort;
		// } // End of component ItsPkiSystem

		} // End of module ItsPki_TestSystem
		No newline at end of file