Commit 0c35435e authored by filatov's avatar filatov

Change AtsSecurity to ItsSecurity

TC_SEC_ITSS_SND_CAM_09_02_BV - change certificates to be used
parent 15edfa0f
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
* @desc Module containing functions for the secured GN ATS * @desc Module containing functions for the secured GN ATS
* *
*/ */
module AtsSecurity_Functions { module ItsSecurity_Functions {
// LibCommon // LibCommon
import from LibCommon_Sync all; import from LibCommon_Sync all;
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
* @desc Module containing Pics for Security ATS * @desc Module containing Pics for Security ATS
* *
*/ */
module AtsSecurity_Pics { module ItsSecurity_Pics {
/** /**
* @desc Set to true to enable specific behavior to validate ITS Security ATS against itself * @desc Set to true to enable specific behavior to validate ITS Security ATS against itself
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
* @desc Module containing templates for secured GeoNetworking ATS * @desc Module containing templates for secured GeoNetworking ATS
* *
*/ */
module AtsSecurity_Templates { module ItsSecurity_Templates {
// // LibIts // // LibIts
// import from DENM_PDU_Descriptions language "ASN.1:1997" all; // import from DENM_PDU_Descriptions language "ASN.1:1997" all;
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
* @desc Testcases file for Security Protocol * @desc Testcases file for Security Protocol
* @see Draft ETSI TS 103 097 V1.1.15 * @see Draft ETSI TS 103 097 V1.1.15
*/ */
module AtsSecurity_TestCases { module ItsSecurity_TestCases {
// Libcommon // Libcommon
import from LibCommon_Time all; import from LibCommon_Time all;
...@@ -52,10 +52,10 @@ module AtsSecurity_TestCases { ...@@ -52,10 +52,10 @@ module AtsSecurity_TestCases {
import from LibItsSecurity_Pics all; import from LibItsSecurity_Pics all;
// AtsSecurity // AtsSecurity
import from AtsSecurity_TestSystem all; import from ItsSecurity_TestSystem all;
import from AtsSecurity_Functions all; import from ItsSecurity_Functions all;
import from AtsSecurity_Templates all; import from ItsSecurity_Templates all;
import from AtsSecurity_Pics all; import from ItsSecurity_Pics all;
/** /**
* @desc Sending behaviour test cases * @desc Sending behaviour test cases
...@@ -981,7 +981,7 @@ module AtsSecurity_TestCases { ...@@ -981,7 +981,7 @@ module AtsSecurity_TestCases {
// Local variables // Local variables
var GeoNetworkingInd v_geoNwInd; var GeoNetworkingInd v_geoNwInd;
var ItsCam v_component; var ItsCam v_component;
timer t_maxTransInterval := 0.3; timer t_maxTransInterval := 0.5;
// Test control // Test control
if (not(PICS_GN_SECURITY)) { if (not(PICS_GN_SECURITY)) {
...@@ -1569,6 +1569,7 @@ module AtsSecurity_TestCases { ...@@ -1569,6 +1569,7 @@ module AtsSecurity_TestCases {
var GeoNetworkingInd v_geoNwInd; var GeoNetworkingInd v_geoNwInd;
var ItsCam v_component; var ItsCam v_component;
var SignerInfo v_si; var SignerInfo v_si;
var boolean f_CamReceived := false;
// Test control // Test control
if (not(PICS_GN_SECURITY)) { if (not(PICS_GN_SECURITY)) {
...@@ -1580,7 +1581,7 @@ module AtsSecurity_TestCases { ...@@ -1580,7 +1581,7 @@ module AtsSecurity_TestCases {
stop; stop;
} }
// Test component configuration // Test component configuration
f_cf01Up(); f_cf01Up(); // init IUT with CERT_IUT_A_AT signed with CERT_TS_A_AA
// Test adapter configuration // Test adapter configuration
...@@ -1605,20 +1606,20 @@ module AtsSecurity_TestCases { ...@@ -1605,20 +1606,20 @@ module AtsSecurity_TestCases {
// Send secured message with request for unrecognized certificate // Send secured message with request for unrecognized certificate
f_sendSecuredCam( f_sendSecuredCam(
cc_taCert_A, cc_taCert_B1 , // certificate signed with CERT_TS_B_AA
{ {
m_header_field_unrecognised_certificate( // containing digests m_header_field_unrecognised_certificate( // containing digests
f_HashedId3FromHashedId8( // containing HashedId3 value f_HashedId3FromHashedId8( // containing HashedId3 value
v_si.signerInfo.digest // referencing to the AA certificate v_si.signerInfo.digest // referencing to the CERT_TS_A_AA certificate
) )
) )
}); });
// Send secured message signed with certificate_chain // Send secured message signed with certificate_chain
f_sendSecuredCam( f_sendSecuredCam(
cc_taCert_A1, cc_taCert_A, // sign message with CERT_TS_A_AT signed with CERT_TS_A_AA
omit, omit,
e_certificate_chain e_certificate_chain // and send both certs in the chain
); );
f_selfOrClientSyncAndVerdictPreamble(c_prDone, e_success); f_selfOrClientSyncAndVerdictPreamble(c_prDone, e_success);
...@@ -1647,14 +1648,19 @@ module AtsSecurity_TestCases { ...@@ -1647,14 +1648,19 @@ module AtsSecurity_TestCases {
mdw_securedMessage_CAMs mdw_securedMessage_CAMs
))) { ))) {
log("*** " & testcasename() & ": INFO: CAM retransmission w/o certificate chain ***"); log("*** " & testcasename() & ": INFO: CAM retransmission w/o certificate chain ***");
f_CamReceived := true;
repeat; repeat;
} }
[] t_maxTransInterval.timeout { [f_CamReceived] t_maxTransInterval.timeout {
tc_ac.stop; tc_ac.stop;
log("*** " & testcasename() & ": PASS: Generation of CAM messages including certificate chain was successfully skipped ***"); log("*** " & testcasename() & ": PASS: Generation of CAM messages including certificate chain was successfully skipped ***");
f_selfOrClientSyncAndVerdictTestBody(c_tbDone, e_success); f_selfOrClientSyncAndVerdictTestBody(c_tbDone, e_success);
} }
[] t_maxTransInterval.timeout {
tc_ac.stop;
log("*** " & testcasename() & ": INCONC: Expected CAM not received ***");
f_selfOrClientSyncAndVerdictTestBody(c_tbDone, e_timeout);
}
[] tc_ac.timeout { [] tc_ac.timeout {
log("*** " & testcasename() & ": INCONC: Expected CAM not received ***"); log("*** " & testcasename() & ": INCONC: Expected CAM not received ***");
f_selfOrClientSyncAndVerdictTestBody(c_tbDone, e_timeout); f_selfOrClientSyncAndVerdictTestBody(c_tbDone, e_timeout);
...@@ -11,7 +11,7 @@ module ItsSecurity_TestControl { ...@@ -11,7 +11,7 @@ module ItsSecurity_TestControl {
import from LibItsGeoNetworking_Pics all; import from LibItsGeoNetworking_Pics all;
// ItsSecurity // ItsSecurity
import from AtsSecurity_TestCases all; import from ItsSecurity_TestCases all;
import from LibItsSecurity_Pics all; import from LibItsSecurity_Pics all;
// Test Execution // Test Execution
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
* @desc Module containing t fest system description for the secured GN ATS * @desc Module containing t fest system description for the secured GN ATS
* *
*/ */
module AtsSecurity_TestSystem { module ItsSecurity_TestSystem {
import from LibItsCommon_TestSystem all; import from LibItsCommon_TestSystem all;
import from LibItsCam_TestSystem all; import from LibItsCam_TestSystem all;
......
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