Commit cc9ac90d authored by berge's avatar berge
Browse files

Fixed Port definitions 

Renamed ePassport_Messages.ttcn to ePassport_Functions.ttcn
parent 98fb0d05

ePassport/ttcn/ePassport_Messages.ttcn→ePassport/ttcn/ePassport_Functions.ttcn

+2 −2
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ 
 *

 */

 

 module ePassport_Messages {

 module ePassport_Functions {



	//LibCommon

	import from LibCommon_DataStrings all;
@@ -529,7 +529,7 @@ function f_chipAuth (inout template EFfile p_file) runs on MRTD 
					// Both the MRTD chip and the inspection system compute the following:

					// a) The shared secret K = KA(SKPICC;^PKPCD;DPICC) = KA(^SKPCD;PKPICC;DPICC)

					// b) The session keys KMAC and KEnc derived from K for Secure Messaging.

					// c) The hash of the inspection systems ephemeral public key H(^PKPCD) for Terminal Authentication.

					// c) The hash of the inspection system�s ephemeral public key H(^PKPCD) for Terminal Authentication.

					

					// fx_chipAuth();

					mrtdport.send(m_responseOK);

ePassport/ttcn/ePassport_MainModule.ttcn

+1 −1
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ module ePassport_MainModule { 
    import from ePassport_Values all;    

    import from ePassport_TestSystem all;    

    import from ePassport_Types all;

    import from ePassport_Messages all;

    import from ePassport_Functions all;

	import from ePassport_Pics all;	

	import from ePassport_Pixits all;

ePassport/ttcn/ePassport_TestSystem.ttcn

+14 −5
Original line number Diff line number Diff line
@@ -15,7 +15,6 @@ module ePassport_TestSystem { 
	import from LibCommon_BasicTypesAndValues all;

	import from LibCommon_TextStrings all;

	//Ats

//	import from ePassport_Messages all;

	import from ePassport_Types all;

	import from ePassport_Pics all;

	import from ePassport_Pixits all;
@@ -44,6 +43,7 @@ module ePassport_TestSystem { 
		port MrtdPort mrtdport;

		port Mgmt 	mgmt;

		//port TaPort		ta;

	

		// Component variables

		var SimuParams vc_simu ;

		var boolean v_checkpoint:=false;
@@ -75,9 +75,18 @@ module ePassport_TestSystem { 
*/



group portDefs {

	type port MrtdPort message {in Command out Response};

	type port Mgmt message {in Command out Response};

//	type port TaPort message {in Command out Response};

	

	type port MrtdPort message {

		in Command; 

		out Response;

	};

	

	type port Mgmt message {

		in Command;

		out Response;

	};

	

	//type port TaPort message {in Command, out Response};

}

ePassport/ttcn/ePassport_Testcases.ttcn

+12 −12
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ module ePassport_Testcases { 
	import from ePassport_Values all;    

    import from ePassport_TestSystem all;    

    import from ePassport_Types all;

    import from ePassport_Messages all;

    import from ePassport_Functions all;

	import from ePassport_Pics all;	

	import from ePassport_Pixits all;
@@ -35,7 +35,7 @@ testcase ISO7816_A02() runs on MRTD system MRTD_System 
	map(self:mgmt, system: system_mgmt);

	map(self:mrtdport, system: system_mrtdPort);



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

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

	f_start();

	f_SIP (v_cfg);
@@ -72,7 +72,7 @@ testcase ISO7816_D02() runs on MRTD system MRTD_System 
	



	

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

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

	f_start();

		

	f_AIP (v_cfg);
@@ -108,7 +108,7 @@ testcase ISO7816_E06() runs on MRTD system MRTD_System 


    v_cfg.efsod:=valueof(m_EF_SOD_E06);



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

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

	f_start();

	f_AIP (v_cfg);
@@ -321,7 +321,7 @@ testcase ISO7816_E18() runs on MRTD system MRTD_System 
// stores a incomplete birth date (missing day)

// profile AIP

// Configuration file: default EAC + modif DG1 and MRZ

// Expected results: Layer 7 message: No error"

// Expected results: Layer 7 message: �No error"



testcase LDS_B25() runs on MRTD system MRTD_System

{
@@ -360,7 +360,7 @@ testcase LDS_B25() runs on MRTD system MRTD_System 
// wrong (BHT, incorrect biometric subtype)

// profile AIP

// Configuration file: default EAC + modif DG3

// Expected results: Layer 7 message: Failure in DG3

// Expected results: Layer 7 message: �Failure in DG3�



testcase LDS_D12() runs on MRTD system MRTD_System

{
@@ -374,7 +374,7 @@ testcase LDS_D12() runs on MRTD system MRTD_System 
	map(self:mgmt, system: system_mgmt);

	map(self:mrtdport, system: system_mrtdPort);

	

	activate(a_mgmt('1400'O)); //  Failure in DG3

	activate(a_mgmt('1400'O)); //  �Failure in DG3�



	f_start();

	v_cfg.dg3:=valueof(m_DG3_LDS_D12);
@@ -414,7 +414,7 @@ testcase LDS_D12() runs on MRTD system MRTD_System 
	

//	f_getreport();



	a_mgmt('1400'O);	// Failure in DG3

	a_mgmt('1400'O);	// �Failure in DG3�



	

	//	TWait.stop;
@@ -431,7 +431,7 @@ testcase LDS_D12() runs on MRTD system MRTD_System 
// profile AIP

// Configuration file: default EAC + modif DG14 ( with not allowed chip authentication public key info OID

// in SecurityInfos )

// Expected results: Layer 7 message: Failure in DG14

// Expected results: Layer 7 message: �Failure in DG14�



testcase LDS_F04() runs on MRTD system MRTD_System

{
@@ -444,7 +444,7 @@ testcase LDS_F04() runs on MRTD system MRTD_System 
	map(self:mgmt, system: system_mgmt);

	map(self:mrtdport, system: system_mrtdPort);

	

	activate(a_mgmt('1f00'O)); //  Failure in DG14

	activate(a_mgmt('1f00'O)); //  �Failure in DG14�

	

	f_start();

	v_cfg.dg14:=valueof(m_DG14_LDS_F04);
@@ -481,7 +481,7 @@ testcase LDS_F04() runs on MRTD system MRTD_System 
// wrong (SignerInfo, incorrect Signature)

// profile AIP

// Configuration file: default EAC + modif EF.SOD ( with incorrect Signature in SignerInfo)

// Expected results: Layer 7 message: Failure in EF.SOD

// Expected results: Layer 7 message: �Failure in EF.SOD�



testcase LDS_H37() runs on MRTD system MRTD_System

{
@@ -498,7 +498,7 @@ testcase LDS_H37() runs on MRTD system MRTD_System 
	map(self:mrtdport, system: system_mrtdPort);

	



	activate(a_mgmt('1100'O));   //  Failure in EF.SOD

	activate(a_mgmt('1100'O));   //  �Failure in EF.SOD�

	

	f_start();

	v_cfg.efsod:=valueof(m_EF_SOD_LDS_H37);

ePassport/ttcn/ePassport_Values.ttcn

+7 −7
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ module ePassport_Values { 
//	import from ePassport_Pics all;	

	import from ePassport_Pixits all;	

//	import from ePassport_Testsystem all;

//	import from ePassport_Messages all;

//	import from ePassport_Functions all;
@@ -500,28 +500,28 @@ group Response_templates 
// Response OK

	template Response m_responseOK

	:={

		response_data:=omit,

		responseData:=omit,

		w1w2:='9000'O

	}



// Response Data Template

	template Response m_responseNOK(W1W2status v_w1w2)

	:={

		response_data:= omit,

		responseData:= omit,

		w1w2:= v_w1w2

	}



// Response Data Template

	template Response m_response_read(Response_Data v_data)

	template Response m_response_read(ResponseData v_data)

	:={

		response_data:= v_data,

		responseData:= v_data,

		w1w2:='9000'O

	}



// Response Data Template

	template Response m_response(Response_Data v_data, W1W2status v_w1w2)

	template Response m_response(ResponseData v_data, W1W2status v_w1w2)

	:={

		response_data:= v_data,

		responseData:= v_data,

		w1w2:= v_w1w2

	}