Commit 55c55925 authored by Denis Filatov's avatar Denis Filatov
Browse files

Fix testcases 01-12

parent ac507135

ItsSecurity_Functions.ttcn

+2 −1
Original line number Diff line number Diff line
@@ -772,8 +772,9 @@ module ItsSecurity_Functions { 
        */

        function f_terminateCam(inout ItsCam p_camComponent) runs on ItsBaseComponent {

            

            p_camComponent.done;

            //p_camComponent.done;

            p_camComponent.kill;

            p_camComponent.done;

            

        } // End of function f_terminateCam

ItsSecurity_TestCases.ttcn

+307 −253

File changed.

Preview size limit exceeded, changes collapsed.

ItsSecurity_TestControl.ttcn

+12 −3
Original line number Diff line number Diff line
@@ -36,7 +36,12 @@ module ItsSecurity_TestControl { 
            execute(TC_SEC_ITSS_SND_CAM_02_BV());

            execute(TC_SEC_ITSS_SND_CAM_03_BV());

            execute(TC_SEC_ITSS_SND_CAM_04_BV());

            execute(TC_SEC_ITSS_SND_CAM_05_BV());

            execute(TC_SEC_ITSS_SND_CAM_05_A_BV());

            execute(TC_SEC_ITSS_SND_CAM_05_AN_BV());

            execute(TC_SEC_ITSS_SND_CAM_05_B_BV());

            execute(TC_SEC_ITSS_SND_CAM_05_BN_BV());

            execute(TC_SEC_ITSS_SND_CAM_05_C_BV());

            execute(TC_SEC_ITSS_SND_CAM_05_CN_BV());

            execute(TC_SEC_ITSS_SND_CAM_06_BV());

            execute(TC_SEC_ITSS_SND_CAM_07_BV());

            execute(TC_SEC_ITSS_SND_CAM_08_BV());
@@ -53,8 +58,12 @@ module ItsSecurity_TestControl { 
            execute(TC_SEC_ITSS_SND_CAM_18_BV());

            execute(TC_SEC_ITSS_SND_CAM_19_BV());

            execute(TC_SEC_ITSS_SND_CAM_20_BV());

            execute(TC_SEC_ITSS_SND_CAM_21_BV());

            execute(TC_SEC_ITSS_SND_CAM_22_BV());

            execute(TC_SEC_ITSS_SND_CAM_21_A_BV());

            execute(TC_SEC_ITSS_SND_CAM_21_B_BV());

            execute(TC_SEC_ITSS_SND_CAM_21_C_BV());

            execute(TC_SEC_ITSS_SND_CAM_22_A_BV());

            execute(TC_SEC_ITSS_SND_CAM_22_B_BV());

            execute(TC_SEC_ITSS_SND_CAM_22_C_BV());

            execute(TC_SEC_ITSS_SND_CAM_23_BV());

            execute(TC_SEC_ITSS_SND_CAM_24_BV());

            execute(TC_SEC_ITSS_SND_CAM_25_BV());

lib/LibItsSecurity_Templates.ttcn

+6 −0
Original line number Diff line number Diff line
@@ -1063,6 +1063,12 @@ module LibItsSecurity_Templates { 
            ecdsaBrainpoolP256r1Signature := p_ecdsaBrainpoolP256r1Signature

        }  // End of template m_signature_ecdsaBrainpoolP256r1

        

        template (value) Signature m_signature_ecdsaNistP384(

                                                                    in template (value) EcdsaP384Signature p_ecdsaNistP384Signature

        ) := {

            ecdsaNistP384Signature := p_ecdsaNistP384Signature

        } // End of template m_signature_ecdsaNistP384

        

        template (value) Signature m_signature_ecdsaBrainpoolP384r1(

                                                                    in template (value) EcdsaP384Signature p_ecdsaBrainpoolP384r1Signature

        ) := {

lib/LibItsSecurity_TypesAndValues.ttcn

+4 −0
Original line number Diff line number Diff line
@@ -46,6 +46,10 @@ module LibItsSecurity_TypesAndValues { 
        const charstring cc_taCert_E  := "CERT_TS_E_AT"; /** Certificate with a region identifier, to be used when secured messages are sent from TA to IUT */

        const charstring cc_taCert_F  := "CERT_TS_F_AT"; /** Certificate that can be used as an unknown certificate for IUT. */

        const charstring cc_taCert_F3 := "CERT_TS_F3_AT"; /** Certificate that can be used as an unknown certificate for IUT with BrainpoolP384 curve. */

        const charstring cc_taCert_FA_AA  := "CERT_TS_FA_AA"; /** AA certificate that can be used as an unknown AA certificate for IUT. */

        const charstring cc_taCert_FA3_AA  := "CERT_TS_FA3_AA"; /** AA certificate with BrainpoolP384 curve that can be used as an unknown AA certificate for IUT. */

        const charstring cc_taCert_FA  := "CERT_TS_FA_AT"; /** Certificate, signed by CERT_TS_FA_AA, that can be used as an unknown certificate for IUT. */

        const charstring cc_taCert_FA3 := "CERT_TS_FA3_AT"; /** Certificate, signed by CERT_TS_FA3_AA,  that can be used as an unknown certificate for IUT with BrainpoolP384 curve. */

        const charstring cc_taCert_G  := "CERT_TS_G_AT"; /** to be defined */

        const charstring cc_taCert_EC := "CERT_TS_A_EC"; /** Certificate with a subject type indicating 'enrolment_credentials', to be used when secured messages are sent from TA to IUT */

        const charstring cc_taCert_AA := "CERT_TS_A_AA"; /** Certificate with a subject type indicating 'authorisation_authority', to be used when secured messages are sent from TA to IUT */