Commit 3a3e268b authored by berge's avatar berge
Browse files

Changed some template names

parent bc60b2a8

ePassport/ttcn/ePassport_Functions.ttcn

+4 −4
Original line number Diff line number Diff line
@@ -520,7 +520,7 @@ function f_chipAuth (inout template EFfile p_file) runs on MRTD 
// and sends the ephemeral public key^PKPCD to the MRTD chip, via the MSE:SetKAT message.

		

			alt {

				[] mrtdport.receive(mw_mse_SetKAT) -> value v_command {

				[] mrtdport.receive(mw_mse_setKAT) -> value v_command {

					v_keyreference:=v_command.payload.plainText.commandData;

					

					// Both the MRTD chip and the inspection system compute the following:
@@ -582,7 +582,7 @@ function f_terminalAuth (inout template EFfile p_file) runs on MRTD 


	// The MRTD is waiting a MSE:SetAT message with a key reference

		alt {

				[] mrtdport.receive(mw_mse_SetAT) -> value v_command 

				[] mrtdport.receive(mw_mse_setAT) -> value v_command 

					{

					v_keyreference:=v_command.payload.plainText.commandData;

					mrtdport.send(m_responseOK);
@@ -660,7 +660,7 @@ function f_mse_SetDST() runs on MRTD 
// The MRTD is waiting for a MSE:SetDST message including the IS key reference

			alt	

				{

				[] mrtdport.receive(mw_mse_SetDST) -> value v_command 

				[] mrtdport.receive(mw_mse_setDST) -> value v_command 

					{

					v_keyreference:=v_command.payload.plainText.commandData;

					mrtdport.send(m_responseOK);
@@ -677,7 +677,7 @@ function f_mse_SetDST() runs on MRTD 


// The MRTD is waiting for a PSO:Verify Certificate

			alt {

				[] mrtdport.receive(mw_pso_VerifyCertificate) -> value v_command 

				[] mrtdport.receive(mw_pso_verifyCertificate) -> value v_command 

					{

							 

					// if the Certificate Body and the Signature are OK then the certificate was successfully validated

ePassport/ttcn/ePassport_Templates.ttcn

+47 −47
Original line number Diff line number Diff line
@@ -94,10 +94,10 @@ module ePassport_Templates { 
	  	payload := mw_payload(v_failCode, 0)

	}



    group Simple_files_templates {

    group simpleFileTemplates {

    	

		// TEMPLATES EF.COM file

        template (value) EFfile m_EF_COM := {

        template (value) EFfile m_file_EF_COM := {

		    filename := "EF.COM",

			shortFID := '1e'O,

			fileID := '011e'O,
@@ -105,7 +105,7 @@ module ePassport_Templates { 
		}



		// TEMPLATES EF.SOD file

        template (value) EFfile m_EF_SOD := {

        template (value) EFfile m_file_EF_SOD := {

		    filename := "EF.SOD",

			shortFID := '1d'O,

			fileID := '011d'O,
@@ -113,7 +113,7 @@ module ePassport_Templates { 
		}



		// TEMPLATES DG1 file

        template (value) EFfile m_DG1 := {

        template (value) EFfile m_file_DG1 := {

		    filename := "EF.DG1",

			shortFID := '01'O,

			fileID := '0101'O,
@@ -121,7 +121,7 @@ module ePassport_Templates { 
		}



		// TEMPLATES DG2 file

        template (value) EFfile m_DG2 := {

        template (value) EFfile m_file_DG2 := {

		    filename := "EF.DG2",

			shortFID := '02'O,

			fileID := '0102'O,
@@ -129,7 +129,7 @@ module ePassport_Templates { 
		}



		// TEMPLATES DG3 file

        template (value) EFfile m_DG3 := {

        template (value) EFfile m_file_DG3 := {

		    filename := "EF.DG3",

			shortFID := '03'O,

			fileID := '0103'O,
@@ -137,7 +137,7 @@ module ePassport_Templates { 
		}



		// TEMPLATES DG4 file

        template (value) EFfile m_DG4 := {

        template (value) EFfile m_file_DG4 := {

		    filename := "EF.DG4",

			shortFID := '04'O,

			fileID := '0104'O,
@@ -145,7 +145,7 @@ module ePassport_Templates { 
		}



		// TEMPLATES DG14 file

        template (value) EFfile m_DG14 := {

        template (value) EFfile m_file_DG14 := {

		    filename := "EF.DG14",

			shortFID := '0e'O,

			fileID := '010e'O,
@@ -153,7 +153,7 @@ module ePassport_Templates { 
		 }



		// TEMPLATES DG15 file

        template (value) EFfile m_DG15 := {

        template (value) EFfile m_file_DG15 := {

		    filename := "EF.DG15",

			shortFID := '0f'O,

			fileID := '010f'O,
@@ -162,7 +162,7 @@ module ePassport_Templates { 




		// TEMPLATES EF.CVCA file

        template (value) EFfile m_EF_CVCA := {

        template (value) EFfile m_file_EF_CVCA := {

		    filename := "EF.CVCA",

			shortFID := '1c'O,

			fileID := '011c'O,
@@ -175,7 +175,7 @@ module ePassport_Templates { 
    group Modified_files_templates

    {

		// TEMPLATES EF.SOD file modified according E_06

        template (value) EFfile m_EF_SOD_E06 := {

        template (value) EFfile m_file_EF_SOD_E06 := {

		    filename := "EF.CVCA.E06",

			shortFID := '1c'O,

			fileID := '011c'O,
@@ -183,7 +183,7 @@ module ePassport_Templates { 
		}



		// TEMPLATES EF.CVCA_E08 file

        template (value) EFfile m_EF_CVCA_E08 := {

        template (value) EFfile m_file_EF_CVCA_E08 := {

		    filename := "EF.CVCA.E08",

			shortFID := '1c'O,

			fileID := '011c'O,
@@ -191,7 +191,7 @@ module ePassport_Templates { 
		}



		// TEMPLATES EF.SOD_E08 file

        template (value) EFfile m_EF_SOD_E08 := {

        template (value) EFfile m_file_EF_SOD_E08 := {

		    filename := "EF.SOD.E08",

			shortFID := '1d'O,

			fileID := '011d'O,
@@ -199,7 +199,7 @@ module ePassport_Templates { 
		}



		// TEMPLATES DG1_LDS_B25 file

        template (value) EFfile m_DG1_LDS_B25 := {

        template (value) EFfile m_file_DG1_LDS_B25 := {

		    filename := "EF.DG1.LDS_B25",

			shortFID := '01'O,

			fileID := '0101'O,
@@ -207,7 +207,7 @@ module ePassport_Templates { 
		}



		// TEMPLATES EF.SOD file

        template (value) EFfile m_EF_SOD_LDS_B25 := {

        template (value) EFfile m_file_EF_SOD_LDS_B25 := {

		    filename := "EF.SOD.LDS_B25",

			shortFID := '1d'O,

			fileID := '011d'O,
@@ -215,7 +215,7 @@ module ePassport_Templates { 
		}



		// TEMPLATES DG3_LDS_D12 file

        template (value) EFfile m_DG3_LDS_D12 := {

        template (value) EFfile m_file_DG3_LDS_D12 := {

		    filename := "EF.DG3.LDS_D12",

			shortFID := '01'O,

			fileID := '0101'O,
@@ -223,7 +223,7 @@ module ePassport_Templates { 
		}



		// TEMPLATES EF.SOD file LDS_D12

        template (value) EFfile m_EF_SOD_LDS_D12 := {

        template (value) EFfile m_file_EF_SOD_LDS_D12 := {

		    filename := "EF.SOD.LDS_D12",

			shortFID := '1d'O,

			fileID := '011d'O,
@@ -231,7 +231,7 @@ module ePassport_Templates { 
		}



		// TEMPLATES DG3_LDS_F04 file

        template (value) EFfile m_DG14_LDS_F04 := {

        template (value) EFfile m_file_DG14_LDS_F04 := {

		    filename := "EF.DG14.LDS_F04",

			shortFID := '01'O,

			fileID := '0101'O,
@@ -239,7 +239,7 @@ module ePassport_Templates { 
		}



		// TEMPLATES EF.SOD file LDS_F04

        template (value) EFfile m_EF_SOD_LDS_F04 := {

        template (value) EFfile m_file_EF_SOD_LDS_F04 := {

		    filename := "EF.SOD.LDS_F04",

			shortFID := '1d'O,

			fileID := '011d'O,
@@ -247,7 +247,7 @@ module ePassport_Templates { 
		}



		// TEMPLATES EF.SOD file LDS_H37

        template (value) EFfile m_EF_SOD_LDS_H37 := {

        template (value) EFfile m_file_EF_SOD_LDS_H37 := {

		    filename := "EF.SOD.LDS_H37",

			shortFID := '1d'O,

			fileID := '011d'O,
@@ -260,10 +260,10 @@ module ePassport_Templates { 
    	

        // TEMPLATES Configuration set

        template (value) ConfigurationSet m_cfg_plain := {

            efcom := m_EF_COM,

    		efsod := m_EF_SOD,

    		dg1 := m_DG1,

    		dg2 := m_DG2,

            efcom := m_file_EF_COM,

    		efsod := m_file_EF_SOD,

    		dg1 := m_file_DG1,

    		dg2 := m_file_DG2,

    		dg3 := omit,

    		dg4 :=omit,

    		dg14 :=omit,
@@ -276,10 +276,10 @@ module ePassport_Templates { 
    	};

    

    	template (value) ConfigurationSet m_cfg_bac := {

            efcom := m_EF_COM,

    		efsod := m_EF_SOD,

    		dg1 := m_DG1,

    		dg2 := m_DG2,

            efcom := m_file_EF_COM,

    		efsod := m_file_EF_SOD,

    		dg1 := m_file_DG1,

    		dg2 := m_file_DG2,

    		dg3 := omit,

    		dg4 := omit,

    		dg14 := omit,
@@ -292,13 +292,13 @@ module ePassport_Templates { 
    	};

    

    	template (value) ConfigurationSet m_cfg_eac := {

            efcom := m_EF_COM,

    		efsod := m_EF_SOD,

    		dg1 := m_DG1,

    		dg2 := m_DG2,

    		dg3 := m_DG3,

    		dg4 := m_DG4,

    		dg14 := m_DG14,

            efcom := m_file_EF_COM,

    		efsod := m_file_EF_SOD,

    		dg1 := m_file_DG1,

    		dg2 := m_file_DG2,

    		dg3 := m_file_DG3,

    		dg4 := m_file_DG4,

    		dg14 := m_file_DG14,

    		dg15 := omit,

    		efcvca := omit,

    		fileslist := "EF.COM,EF.SOD,DG1,DG2,DG3,DG4,DG14",
@@ -309,14 +309,14 @@ module ePassport_Templates { 
    

    

    	template (value) ConfigurationSet m_cfg_eac_aa := {

            efcom := m_EF_COM,

    		efsod := m_EF_SOD,

    		dg1 := m_DG1,

    		dg2 := m_DG2,

    		dg3 := m_DG3,

    		dg4 := m_DG4,

    		dg14 := m_DG14,

    		dg15 := m_DG15,

            efcom := m_file_EF_COM,

    		efsod := m_file_EF_SOD,

    		dg1 := m_file_DG1,

    		dg2 := m_file_DG2,

    		dg3 := m_file_DG3,

    		dg4 := m_file_DG4,

    		dg14 := m_file_DG14,

    		dg15 := m_file_DG15,

    		efcvca := omit,

    		fileslist := "EF.COM,EF.SOD,DG1,DG2,DG3,DG4,DG14,DG15",

     		docNumber := "C11T002JM4",
@@ -422,7 +422,7 @@ module ePassport_Templates { 
			payload := mw_payload(?, ?)

        }



		template Command mw_mse_SetDST:= {

		template Command mw_mse_setDST:= {

	      	class := mw_class_00,

		  	ins := e_manageSecurityEnvironment, //'22'O,

		  	p1 := '1??????1'B,  //to change
@@ -431,7 +431,7 @@ module ePassport_Templates { 
		  	payload := mw_payload(?, ?)

        }



		template Command mw_mse_SetKAT:= {

		template Command mw_mse_setKAT:= {

	      	class := mw_class_00,

		  	ins := e_manageSecurityEnvironment, //'22'O,

		  	p1 := '01000001'B,  //meaning Set DST defined by bit7 of P1 and P2=A6 means KAT
@@ -447,7 +447,7 @@ module ePassport_Templates { 
		  	payload := mw_payload(?, ?)

        }



		template Command mw_mse_SetAT:= {

		template Command mw_mse_setAT:= {

	      	class := mw_class_00,

		  	ins := e_manageSecurityEnvironment, //'22'O,

		  	p1 := '10000001'B,  // need to define correct P1 !!!!
@@ -455,7 +455,7 @@ module ePassport_Templates { 
		  	payload := mw_payload(?, ?)

        }



		template Command mw_pso_VerifyCertificate:= {

		template Command mw_pso_verifyCertificate:= {

	      	class := mw_class_00,

		  	ins := e_performSecurityOperation, //'2a'O,

		  	p1 := '00000000'B,  //need to define correct P1 !!!

ePassport/ttcn/ePassport_Testcases.ttcn

+10 −10
Original line number Diff line number Diff line
@@ -110,7 +110,7 @@ testcase ISO7816_E06() runs on MRTD system MRTD_System 
	map(self:mgmt, system: system_mgmt);

	map(self:mrtdport, system: system_mrtdPort);



    v_cfg.efsod:=valueof(m_EF_SOD_E06);

    v_cfg.efsod:=valueof(m_file_EF_SOD_E06);



	activate(a_mgmt('0000'O)); //  �No Failure�

	f_start();
@@ -149,8 +149,8 @@ testcase ISO7816_E08() runs on MRTD system MRTD_System 


	f_start();

		

    v_cfg.efcvca:=valueof(m_EF_CVCA_E08);

	v_cfg.efsod:=valueof(m_EF_SOD_E08);

    v_cfg.efcvca:=valueof(m_file_EF_CVCA_E08);

	v_cfg.efsod:=valueof(m_file_EF_SOD_E08);

	

	f_wait_application();
@@ -340,8 +340,8 @@ testcase LDS_B25() runs on MRTD system MRTD_System 
	activate(a_mgmt('0000'O)); //  "No Failure"

	

	f_start();

	v_cfg.dg1:=valueof(m_DG1_LDS_B25);

	v_cfg.efsod:=valueof(m_EF_SOD_LDS_B25);

	v_cfg.dg1:=valueof(m_file_DG1_LDS_B25);

	v_cfg.efsod:=valueof(m_file_EF_SOD_LDS_B25);

    v_cfg.mrz:=PXT_MRZ_LDS_B25;



	f_AIP (v_cfg);
@@ -381,8 +381,8 @@ testcase LDS_D12() runs on MRTD system MRTD_System 
	activate(a_mgmt('1400'O)); //  �Failure in DG3�



	f_start();

	v_cfg.dg3:=valueof(m_DG3_LDS_D12);

	v_cfg.efsod:=valueof(m_EF_SOD_LDS_D12);

	v_cfg.dg3:=valueof(m_file_DG3_LDS_D12);

	v_cfg.efsod:=valueof(m_file_EF_SOD_LDS_D12);

	

	f_wait_application();
@@ -451,8 +451,8 @@ testcase LDS_F04() runs on MRTD system MRTD_System 
	activate(a_mgmt('1f00'O)); //  �Failure in DG14�

	

	f_start();

	v_cfg.dg14:=valueof(m_DG14_LDS_F04);

	v_cfg.efsod:=valueof(m_EF_SOD_LDS_F04);

	v_cfg.dg14:=valueof(m_file_DG14_LDS_F04);

	v_cfg.efsod:=valueof(m_file_EF_SOD_LDS_F04);

	

	f_wait_application();
@@ -505,7 +505,7 @@ testcase LDS_H37() runs on MRTD system MRTD_System 
	activate(a_mgmt('1100'O));   //  �Failure in EF.SOD�

	

	f_start();

	v_cfg.efsod:=valueof(m_EF_SOD_LDS_H37);

	v_cfg.efsod:=valueof(m_file_EF_SOD_LDS_H37);

	

	f_wait_application();