diff --git a/ttcn/AtsSecurity/AtsSecurity_Functions.ttcn3 b/ttcn/AtsSecurity/ItsSecurity_Functions.ttcn similarity index 99% rename from ttcn/AtsSecurity/AtsSecurity_Functions.ttcn3 rename to ttcn/AtsSecurity/ItsSecurity_Functions.ttcn index 6a0233c0f8c66bb2d89bd00dd56bddcc5a7e4416..c7b68d47558d5e3c7f23e660af6a6c25df2cbe11 100644 --- a/ttcn/AtsSecurity/AtsSecurity_Functions.ttcn3 +++ b/ttcn/AtsSecurity/ItsSecurity_Functions.ttcn @@ -5,7 +5,7 @@ * @desc Module containing functions for the secured GN ATS * */ -module AtsSecurity_Functions { +module ItsSecurity_Functions { // LibCommon import from LibCommon_Sync all; diff --git a/ttcn/AtsSecurity/AtsSecurity_Pics.ttcn3 b/ttcn/AtsSecurity/ItsSecurity_Pics.ttcn similarity index 94% rename from ttcn/AtsSecurity/AtsSecurity_Pics.ttcn3 rename to ttcn/AtsSecurity/ItsSecurity_Pics.ttcn index 896f1850c0eea3f6b8bb899b92cd4c96263d93bd..b53b3514cc1fc93ae6ef66c7283b5620c7ee6ef4 100644 --- a/ttcn/AtsSecurity/AtsSecurity_Pics.ttcn3 +++ b/ttcn/AtsSecurity/ItsSecurity_Pics.ttcn @@ -5,7 +5,7 @@ * @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 diff --git a/ttcn/AtsSecurity/AtsSecurity_Templates.ttcn3 b/ttcn/AtsSecurity/ItsSecurity_Templates.ttcn similarity index 95% rename from ttcn/AtsSecurity/AtsSecurity_Templates.ttcn3 rename to ttcn/AtsSecurity/ItsSecurity_Templates.ttcn index d52296b32e851de9ee607b7d5e4813f959a1c96e..5fc29a4cd389c26a5873befa776064419a94e0c8 100644 --- a/ttcn/AtsSecurity/AtsSecurity_Templates.ttcn3 +++ b/ttcn/AtsSecurity/ItsSecurity_Templates.ttcn @@ -5,7 +5,7 @@ * @desc Module containing templates for secured GeoNetworking ATS * */ -module AtsSecurity_Templates { +module ItsSecurity_Templates { // // LibIts // import from DENM_PDU_Descriptions language "ASN.1:1997" all; diff --git a/ttcn/AtsSecurity/AtsSecurity_TestCases.ttcn3 b/ttcn/AtsSecurity/ItsSecurity_TestCases.ttcn similarity index 99% rename from ttcn/AtsSecurity/AtsSecurity_TestCases.ttcn3 rename to ttcn/AtsSecurity/ItsSecurity_TestCases.ttcn index 1c61180f30f5bbc5c042c141ac13ae62c9372b2e..6b395ab86d88de1aedf3e8f55fb6477d01e60f28 100644 --- a/ttcn/AtsSecurity/AtsSecurity_TestCases.ttcn3 +++ b/ttcn/AtsSecurity/ItsSecurity_TestCases.ttcn @@ -5,7 +5,7 @@ * @desc Testcases file for Security Protocol * @see Draft ETSI TS 103 097 V1.1.15 */ -module AtsSecurity_TestCases { +module ItsSecurity_TestCases { // Libcommon import from LibCommon_Time all; @@ -52,10 +52,10 @@ module AtsSecurity_TestCases { import from LibItsSecurity_Pics all; // AtsSecurity - import from AtsSecurity_TestSystem all; - import from AtsSecurity_Functions all; - import from AtsSecurity_Templates all; - import from AtsSecurity_Pics all; + import from ItsSecurity_TestSystem all; + import from ItsSecurity_Functions all; + import from ItsSecurity_Templates all; + import from ItsSecurity_Pics all; /** * @desc Sending behaviour test cases @@ -981,7 +981,7 @@ module AtsSecurity_TestCases { // Local variables var GeoNetworkingInd v_geoNwInd; var ItsCam v_component; - timer t_maxTransInterval := 0.3; + timer t_maxTransInterval := 0.5; // Test control if (not(PICS_GN_SECURITY)) { @@ -1569,6 +1569,7 @@ module AtsSecurity_TestCases { var GeoNetworkingInd v_geoNwInd; var ItsCam v_component; var SignerInfo v_si; + var boolean f_CamReceived := false; // Test control if (not(PICS_GN_SECURITY)) { @@ -1580,7 +1581,7 @@ module AtsSecurity_TestCases { stop; } // Test component configuration - f_cf01Up(); + f_cf01Up(); // init IUT with CERT_IUT_A_AT signed with CERT_TS_A_AA // Test adapter configuration @@ -1605,20 +1606,20 @@ module AtsSecurity_TestCases { // Send secured message with request for unrecognized certificate f_sendSecuredCam( - cc_taCert_A, + cc_taCert_B1 , // certificate signed with CERT_TS_B_AA { m_header_field_unrecognised_certificate( // containing digests 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 f_sendSecuredCam( - cc_taCert_A1, + cc_taCert_A, // sign message with CERT_TS_A_AT signed with CERT_TS_A_AA omit, - e_certificate_chain + e_certificate_chain // and send both certs in the chain ); f_selfOrClientSyncAndVerdictPreamble(c_prDone, e_success); @@ -1647,14 +1648,19 @@ module AtsSecurity_TestCases { mdw_securedMessage_CAMs ))) { log("*** " & testcasename() & ": INFO: CAM retransmission w/o certificate chain ***"); + f_CamReceived := true; repeat; } - [] t_maxTransInterval.timeout { + [f_CamReceived] t_maxTransInterval.timeout { tc_ac.stop; log("*** " & testcasename() & ": PASS: Generation of CAM messages including certificate chain was successfully skipped ***"); 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 { log("*** " & testcasename() & ": INCONC: Expected CAM not received ***"); f_selfOrClientSyncAndVerdictTestBody(c_tbDone, e_timeout); diff --git a/ttcn/AtsSecurity/AtsSecurity_TestControl.ttcn3 b/ttcn/AtsSecurity/ItsSecurity_TestControl.ttcn similarity index 99% rename from ttcn/AtsSecurity/AtsSecurity_TestControl.ttcn3 rename to ttcn/AtsSecurity/ItsSecurity_TestControl.ttcn index a2031299d1335beb1385b65eab2bca0b0c03bd06..3fcdfaf677ee3ce4df3a40e784a7aa2c95f70bc2 100644 --- a/ttcn/AtsSecurity/AtsSecurity_TestControl.ttcn3 +++ b/ttcn/AtsSecurity/ItsSecurity_TestControl.ttcn @@ -11,7 +11,7 @@ module ItsSecurity_TestControl { import from LibItsGeoNetworking_Pics all; // ItsSecurity - import from AtsSecurity_TestCases all; + import from ItsSecurity_TestCases all; import from LibItsSecurity_Pics all; // Test Execution diff --git a/ttcn/AtsSecurity/AtsSecurity_TestSystem.ttcn3 b/ttcn/AtsSecurity/ItsSecurity_TestSystem.ttcn similarity index 93% rename from ttcn/AtsSecurity/AtsSecurity_TestSystem.ttcn3 rename to ttcn/AtsSecurity/ItsSecurity_TestSystem.ttcn index 471926fd8953f74c03d87ddd6802ad07d6ccf138..066ccf788636b96a0d15937aba7d1465c568374e 100644 --- a/ttcn/AtsSecurity/AtsSecurity_TestSystem.ttcn3 +++ b/ttcn/AtsSecurity/ItsSecurity_TestSystem.ttcn @@ -5,7 +5,7 @@ * @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 LibItsCam_TestSystem all;