Commit a0812a08 authored by berge's avatar berge
Browse files

Fixed privateKey loading issues

parent 385fa0fa

ePassport/ttcn/ePassport_Functions.ttcn

+3 −3
Original line number Original line Diff line number Diff line
@@ -431,12 +431,12 @@ 
			var octetstring v_k;

			var octetstring v_k;

			var octetstring v_h;

			var octetstring v_h;

			var octetstring v_dg14;

			var octetstring v_dg14;

			var octetstring v_dhPrivateKey;

			var octetstring v_dg14PrivateKey;

			

			

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

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

			f_readFileData(c_fileDG14, 0, -1, v_dg14);

			f_readFileData(c_fileDG14, 0, -1, v_dg14);

			f_readFileData(c_fileDG14, 0, -1, v_dhPrivateKey);

			f_readFileData(c_filePrCA, 0, -1, v_dg14PrivateKey);

			v_k := f_computeSharedSecret(v_dhPrivateKey, v_dg14, p_publicKeyPcd);

			v_k := f_computeSharedSecret(v_dg14PrivateKey, v_dg14, p_publicKeyPcd);

								

								

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

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

			f_deriveKeys(v_k, vc_simu.kEnc, vc_simu.kMac);

			f_deriveKeys(v_k, vc_simu.kEnc, vc_simu.kMac);

ePassport/ttcn/ePassport_Values.ttcn

+3 −2
Original line number Original line Diff line number Diff line
@@ -32,7 +32,8 @@ module ePassport_Values { 




		const FileInfo c_noFileInfo := {filename := "", shortFileId := '00'O, longFileId := '0000'O};

		const FileInfo c_noFileInfo := {filename := "", shortFileId := '00'O, longFileId := '0000'O};

		const FileInfo c_fileMRZ := {filename := "MRZ", shortFileId := '00'O, longFileId := '0000'O};

		const FileInfo c_fileMRZ := {filename := "MRZ", shortFileId := '00'O, longFileId := '0000'O};

		const FileInfo c_filePrAA := {filename := "PrAA", shortFileId := '00'O, longFileId := '0000'O};

		const FileInfo c_filePrAA := {filename := "DG15_sk.pkcs8", shortFileId := '00'O, longFileId := '0000'O};

		const FileInfo c_filePrCA := {filename := "DG14_sk.pkcs8", shortFileId := '00'O, longFileId := '0000'O};

		const FileInfo c_fileDG1 := {filename := "EF.DG1", shortFileId := '01'O, longFileId := '0101'O};

		const FileInfo c_fileDG1 := {filename := "EF.DG1", shortFileId := '01'O, longFileId := '0101'O};

        const FileInfo c_fileDG2 := {filename := "EF.DG2", shortFileId := '02'O, longFileId := '0102'O};

        const FileInfo c_fileDG2 := {filename := "EF.DG2", shortFileId := '02'O, longFileId := '0102'O};

        const FileInfo c_fileDG3 := {filename := "EF.DG3", shortFileId := '03'O, longFileId := '0103'O};

        const FileInfo c_fileDG3 := {filename := "EF.DG3", shortFileId := '03'O, longFileId := '0103'O};