Commit 9f9491fb authored by filatov's avatar filatov

Use names instead of HashID for IUT certificate definition in SSP tests ( Fix #0007563 )

parent 3026cfcc
...@@ -34,7 +34,8 @@ module ItsCam_TpFunctions { ...@@ -34,7 +34,8 @@ module ItsCam_TpFunctions {
import from LibItsCam_TypesAndValues all; import from LibItsCam_TypesAndValues all;
import from LibItsCam_Pics all; import from LibItsCam_Pics all;
import from LibItsCam_Pixits all; import from LibItsCam_Pixits all;
import from LibItsSecurity_Functions all;
// 5.2.1 // 5.2.1
group camMessageDissemination { group camMessageDissemination {
...@@ -2997,13 +2998,14 @@ module ItsCam_TpFunctions { ...@@ -2997,13 +2998,14 @@ module ItsCam_TpFunctions {
group camGenerationSSP{ group camGenerationSSP{
function f_CAM_MSD_SSP_BO_XX( function f_CAM_MSD_SSP_BO_XX(
in Oct8 p_certHashedId8, in charstring p_certName,
in template(value) UtCamTrigger p_utEvent, in template(value) UtCamTrigger p_utEvent,
in template(present) CAM pmw_CamMsg, in template(present) CAM pmw_CamMsg,
in template(present) Bit256 pmw_ssp := ? in template(present) Bit256 pmw_ssp := ?
) runs on ItsCam { ) runs on ItsCam {
// Local variables // Local variables
var Oct8 v_certHashedId8;
// Test control // Test control
if (not PICS_CAM_GENERATION) { if (not PICS_CAM_GENERATION) {
...@@ -3025,10 +3027,19 @@ module ItsCam_TpFunctions { ...@@ -3025,10 +3027,19 @@ module ItsCam_TpFunctions {
// Preamble // Preamble
// initialize IUT with given certificate // initialize IUT with given certificate
fx_readCertificateDigest(p_certName, v_certHashedId8);
if( '0000000000000000'O == v_certHashedId8) {
// Certificate not found
log("*** " & testcasename() & ": Required IUT certificate is not found on the test system ***");
setverdict(inconc);
stop;
}
f_prInitialState( f_prInitialState(
e_staticPosition, e_staticPosition,
true, true,
{ hashedId8 := p_certHashedId8 } { hashedId8 := v_certHashedId8 }
); );
f_selfOrClientSyncAndVerdictPreamble(c_prDone, e_success); f_selfOrClientSyncAndVerdictPreamble(c_prDone, e_success);
...@@ -3075,7 +3086,7 @@ module ItsCam_TpFunctions { ...@@ -3075,7 +3086,7 @@ module ItsCam_TpFunctions {
testcase.stop(testcasename() testcase.stop(testcasename()
& ": PICS_SPECIALVEHICLECONTAINER and PICS_PUBLICTRANS need to be set to true"); & ": PICS_SPECIALVEHICLECONTAINER and PICS_PUBLICTRANS need to be set to true");
} }
f_CAM_MSD_SSP_BO_XX(PX_CERT_IUT_CAM_02, f_CAM_MSD_SSP_BO_XX(PX_CERT_IUT_CAM_02,
m_setVehicleRole(c_vehicleRole_publicTransport), m_setVehicleRole(c_vehicleRole_publicTransport),
mw_camMsg_SVC ( mw_publicTransport_any ) mw_camMsg_SVC ( mw_publicTransport_any )
......
...@@ -30,6 +30,8 @@ module ItsDenm_TpFunctions { ...@@ -30,6 +30,8 @@ module ItsDenm_TpFunctions {
import from LibItsDenm_TypesAndValues all; import from LibItsDenm_TypesAndValues all;
import from LibItsDenm_Pics all; import from LibItsDenm_Pics all;
import from LibItsDenm_Pixits all; import from LibItsDenm_Pixits all;
import from LibItsSecurity_Functions all;
// 5.2.1 // 5.2.1
group denMessageTransmission { group denMessageTransmission {
...@@ -2303,13 +2305,14 @@ module ItsDenm_TpFunctions { ...@@ -2303,13 +2305,14 @@ module ItsDenm_TpFunctions {
group denMessageSSP { group denMessageSSP {
function f_DEN_SSP_BV_XX( in Oct8 p_certHashedId8, function f_DEN_SSP_BV_XX( in charstring p_certName,
in template (value) SituationContainer p_situation, in template (value) SituationContainer p_situation,
in template (present) Bit256 pmw_ssp) in template (present) Bit256 pmw_ssp)
runs on ItsDenm { runs on ItsDenm {
var ActionID v_actionId; var ActionID v_actionId;
var DenmInd v_denmInd; var DenmInd v_denmInd;
var Oct8 v_certHashedId8;
// Test control // Test control
if (not PICS_IS_IUT_SECURED) { if (not PICS_IS_IUT_SECURED) {
...@@ -2330,9 +2333,17 @@ module ItsDenm_TpFunctions { ...@@ -2330,9 +2333,17 @@ module ItsDenm_TpFunctions {
// Test adapter configuration // Test adapter configuration
// Preamble // Preamble
fx_readCertificateDigest( p_certName, v_certHashedId8);
if( '0000000000000000'O == v_certHashedId8) {
// Certificate not found
log("*** " & testcasename() & ": Required IUT certificate is not found on the test system ***");
setverdict(inconc);
stop;
}
f_prInitialState( f_prInitialState(
e_staticPosition, e_staticPosition,
{ hashedId8 := p_certHashedId8 } { hashedId8 := v_certHashedId8 }
); );
f_selfOrClientSyncAndVerdictPreamble(c_prDone, e_success); f_selfOrClientSyncAndVerdictPreamble(c_prDone, e_success);
......
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