Commit 629a5f19 authored by berge's avatar berge
Browse files

Fixed syntax errors in ePassportFunctions

parent cc9ac90d
Loading
Loading
Loading
Loading
+13 −13
Original line number Diff line number Diff line
@@ -29,15 +29,15 @@

// The Test Adapter should have filled an array of hexstring with the content of the file
// The TTCN requests here datalength hexstring values of the file=filename, from pointer pt 
external function fx_findstring ( in charstring v_activefile, inout Oct2 v_offset, inout LengthE v_datalength  ) return octetstring;
external function fx_findstring ( in charstring p_activefile, inout Oct2 p_offset, inout LengthE p_datalength  ) return octetstring;

external function fx_bacauth ( inout octetstring v_rnd_ifd, in octetstring c_rnd_icc, inout octetstring Kicc  ) return octetstring;
external function fx_bacauth ( inout octetstring p_rnd_ifd, in octetstring p_rnd_icc, inout octetstring p_kicc  ) return octetstring;

external function fx_activeauth ( inout octetstring v_rnd_ifd ) return octetstring;
external function fx_activeauth ( inout octetstring p_rnd_ifd ) return octetstring;

external function fx_verify_Certificate( in octetstring v_psodata ) return boolean;
external function fx_verify_Certificate( in octetstring p_psodata ) return boolean;
	
external function fx_verify_Signature( in octetstring v_signature ) return boolean;
external function fx_verify_Signature( in octetstring p_signature ) return boolean;



@@ -117,7 +117,7 @@ function f_waitRead(inout template EFfile p_file) runs on MRTD
		var charstring v_activefile:= "000000";
		var Oct2 v_offset:='0000'O;
		var integer v_size:=0;
		var Response_Data v_data;
		var ResponseData v_data;
		var octetstring v_datalength;
		var Oct2 w1w2:='6400'O;    // must be initialized to right value !!!
	
@@ -342,7 +342,7 @@ function f_bac () runs on MRTD
{
		var boolean SecureMessage:=false;
		var Command v_command;
		var Response_Data v_data;
		var ResponseData v_data;

		var LengthE datalength:='00'O;
	//	var octetstring v_rnd_ifd;
@@ -472,9 +472,9 @@ function f_activeAuth (inout template EFfile p_file) runs on MRTD
	
		var EFfile v_file:=valueof(p_file);
		var Command v_command;
		var Oct2 w1w2:='6300'O
		var Oct2 w1w2:='6300'O;
		var octetstring v_rnd_ifd;
		var Response_Data v_data;
		var ResponseData v_data;

	//	f_waitRead(v_file); // here a template of EF.DG15

@@ -512,7 +512,7 @@ function f_chipAuth (inout template EFfile p_file) runs on MRTD
		var EFfile v_file:=valueof(p_file);
		var Command v_command;
		var octetstring v_keyreference;
		var Oct2 w1w2:='6300'O
		var Oct2 w1w2:='6300'O;

// The MRTD chip sends its static Diffie-Hellman public key PKPICC, and the domain parameters
// DPICC to the inspection system. These infos are contained in DG14.
@@ -566,9 +566,9 @@ function f_terminalAuth (inout template EFfile p_file) runs on MRTD
{
		var EFfile v_file:=valueof(p_file);
		var Command v_command;
		var Response_Data v_data;
		var ResponseData v_data;
		var octetstring v_keyreference;
		var Oct2 w1w2:='6300'O
		var Oct2 w1w2:='6300'O;
		var octetstring v_signature;

//	f_waitRead(v_file);  // here a template of EF.CVCA
@@ -656,7 +656,7 @@ function f_mse_SetDST() runs on MRTD
	
		var Command v_command;
		var octetstring v_keyreference;
		var Oct2 w1w2:='6300'O
		var Oct2 w1w2:='6300'O;