Commit 77b95be5 authored by berge's avatar berge
Browse files

Fixed privateKey loading issues

parent 87652a39

ePassport/ttcn/ePassport_Functions.ttcn

+4 −1
Original line number Original line Diff line number Diff line
@@ -423,6 +423,7 @@ 
			

			

			// encrypt message representative

			// encrypt message representative

			log("Read c_filePrAA: ", f_readFileData(c_filePrAA, 0, -1, v_aaPrivateKey));

			log("Read c_filePrAA: ", f_readFileData(c_filePrAA, 0, -1, v_aaPrivateKey));

			log("DG15.sk: ", v_aaPrivateKey);

			return f_encrypt(e_rsa, v_aaPrivateKey, v_f); //FIXME Algorithm!

			return f_encrypt(e_rsa, v_aaPrivateKey, v_f); //FIXME Algorithm!

	   	}

	   	}
@@ -435,7 +436,9 @@ 
			

			

			// 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)

			log("Read c_fileDG14: ", f_readFileData(c_fileDG14, 0, -1, v_dg14)); 

			log("Read c_fileDG14: ", f_readFileData(c_fileDG14, 0, -1, v_dg14)); 

			log("DG14: ", v_dg14);

			log("Read c_filePrCA: ", f_readFileData(c_filePrCA, 0, -1, v_dg14PrivateKey));

			log("Read c_filePrCA: ", f_readFileData(c_filePrCA, 0, -1, v_dg14PrivateKey));

			log("DG14.sk: ", v_dg14PrivateKey);

			v_k := f_computeSharedSecret(v_dg14PrivateKey, 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.

ePassport/ttcn/ePassport_Values.ttcn

+2 −2
Original line number Original line Diff line number Diff line
@@ -32,8 +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 := "DG15_sk.pkcs8", shortFileId := '00'O, longFileId := '0000'O};

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

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

		const FileInfo c_filePrCA := {filename := "DG14.sk", 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};