Commit 94de70a5 authored by berge's avatar berge
Browse files

Added optical MRZ logs + Fixed return type of fx_readFileData()

parent dd920a17

ePassport/ttcn/ePassport_Altsteps.ttcn

+2 −0
Original line number Diff line number Diff line
@@ -558,6 +558,8 @@ 
      		

        		v_result := f_readFileData(vc_simu.currentFiles[v_logicalChannel], 

        			v_offset, v_dataLength, v_data);

        		log("v_data: ", v_data);

        		log("v_result: ", v_result);

        		mrtdport.send(m_responseReadWithStatus(v_data, v_result));

    			t_ac.start;

    			repeat;

ePassport/ttcn/ePassport_Functions.ttcn

+18 −15
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ 


	//LibCommon

	import from LibCommon_DataStrings all;

	import from LibCommon_TextStrings all;



	//Ats

	import from ePassport_TestSystem all;
@@ -213,7 +214,7 @@ 
				in charstring p_filename, 

				in integer p_offset, 

				in integer p_dataLength, 

				out octetstring p_data);

				out octetstring p_data) return octetstring;

				

		} // end fileExternalFunctions
@@ -534,10 +535,8 @@ 
			in integer p_dataLength, 

			out octetstring p_data)

		return W1W2Status {

			//TODO: error handling



			fx_readFileData(p_fileInfo.filename, p_offset, p_dataLength, p_data);

			return c_w1w2NormalProcessing;

			return fx_readFileData(p_fileInfo.filename, p_offset, p_dataLength, p_data);

			

		} //end f_readFileData
@@ -607,7 +606,6 @@ 
			f_readFileData(c_fileCvcaCert01, 0, -1, v_cvcaData);

			if(v_cvcaData != ''O) {

    			v_decodeResult := decvalue(oct2bit(v_cvcaData), v_cvcaCvCertificate);

    			log("v_cvcaCvCertificate: ", v_cvcaCvCertificate);

    			// FIXME check v_decodeREsiult + ispresent 

    			f_addTrustedCertificate(

    				oct2char(v_cvcaCvCertificate.tlvValue.cvCertificateBody.tlvValue.cvCertificateHolderReference.tlvValue),
@@ -625,21 +623,26 @@ 
    

    

        //function for initializing the system and start the ePassport procedure

        function f_initializeIS() runs on MRTD

        {

        function f_initializeIS() runs on MRTD {

            

			var charstring v_opticalMrzLine1 := oct2char(substr(vc_simu.mrz, 0, lengthof(vc_simu.mrz)/2));            

			var charstring v_opticalMrzLine2 := oct2char(substr(vc_simu.mrz, lengthof(vc_simu.mrz)/2, lengthof(vc_simu.mrz)/2));



            // Activate antenna

            f_activateProbe();

            

            if(not(PXT_AUTOMATIC_TEST_INTERFACE)) {

				action("Please ensure that IS starts inspection procedure.");

			}

			else {

				       	



				action(

					"Please ensure that IS starts inspection procedure." & c_CRLF & c_CRLF

					& "Optical MRZ: " & c_CRLF

					& v_opticalMrzLine1 & c_CRLF

					& v_opticalMrzLine2 & c_CRLF

				);

				

				log("Optical MRZ Line 1: ", v_opticalMrzLine1);

				log("Optical MRZ Line 2: ", v_opticalMrzLine2);

			}

        	

        	

        } // end f_initializeIS

			

	} // end initializationFunctions