Commit 9f9491fb authored by filatov's avatar filatov
Browse files

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

parent 3026cfcc

ttcn/AtsCAM/ItsCam_TpFunctions.ttcn

+15 −4
Original line number Diff line number Diff line
@@ -35,6 +35,7 @@ module ItsCam_TpFunctions { 
    import from LibItsCam_Pics all;

    import from LibItsCam_Pixits all;

    

    import from LibItsSecurity_Functions all;



    // 5.2.1

    group camMessageDissemination {
@@ -2997,13 +2998,14 @@ module ItsCam_TpFunctions { 


        group camGenerationSSP{

            function f_CAM_MSD_SSP_BO_XX(

                            in Oct8 p_certHashedId8,

                            in charstring p_certName,

                            in template(value)   UtCamTrigger p_utEvent,

                            in template(present) CAM pmw_CamMsg,

            				in template(present) Bit256 pmw_ssp := ?  

            ) runs on ItsCam {

                

                // Local variables

                var Oct8 v_certHashedId8;

                

                // Test control

                if (not PICS_CAM_GENERATION) {
@@ -3025,10 +3027,19 @@ module ItsCam_TpFunctions { 
                

                // Preamble

                // 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(

                    e_staticPosition, 

                    true, 

                    { hashedId8 := p_certHashedId8 }

                    { hashedId8 := v_certHashedId8 }

                );

                    

                f_selfOrClientSyncAndVerdictPreamble(c_prDone, e_success);

ttcn/AtsDENM/ItsDenm_TpFunctions.ttcn

+13 −2
Original line number Diff line number Diff line
@@ -31,6 +31,8 @@ module ItsDenm_TpFunctions { 
    import from LibItsDenm_Pics all;

    import from LibItsDenm_Pixits all;



    import from LibItsSecurity_Functions all;

    

    // 5.2.1

    group denMessageTransmission {
@@ -2303,13 +2305,14 @@ module ItsDenm_TpFunctions { 
      

      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 (present) Bit256 pmw_ssp)

          runs on ItsDenm {

              

            var ActionID v_actionId;

            var DenmInd v_denmInd;

            var Oct8 v_certHashedId8;

              

            // Test control

            if (not PICS_IS_IUT_SECURED) {
@@ -2330,9 +2333,17 @@ module ItsDenm_TpFunctions { 
            // Test adapter configuration

            

            // 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(

                e_staticPosition, 

                { hashedId8 := p_certHashedId8 }

                { hashedId8 := v_certHashedId8 }

            );

            

            f_selfOrClientSyncAndVerdictPreamble(c_prDone, e_success);