Commit 680ebf6b authored by berge's avatar berge
Browse files

Fixed wrong usage of private key

parent 947709ad

ePassport/ttcn/ePassport_Functions.ttcn

+2 −2
Original line number Diff line number Diff line
@@ -364,7 +364,7 @@ 
			//FIXME

			

			// encrypt message representative

			return f_encrypt(e_rsa, vc_simu.kEnc, v_f); //FIXME Algorithm!

			return f_encrypt(e_rsa, vc_simu.aaPrivateKey, v_f); //FIXME Algorithm!

	   	}

    	

    	function f_chipAuthentication(in octetstring p_publicKeyPcd) runs on MRTD {
@@ -373,7 +373,7 @@ 
			var octetstring v_h;

			

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

			v_k := f_computeSharedSecret(vc_simu.privateKey, p_publicKeyPcd);

			v_k := f_computeSharedSecret(vc_simu.dhPrivateKey, p_publicKeyPcd);

								

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

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

ePassport/ttcn/ePassport_TestSystem.ttcn

+6 −1
Original line number Diff line number Diff line
@@ -53,7 +53,12 @@ module ePassport_TestSystem { 
		FileSet currentFiles,

		octetstring kEnc,

		octetstring kMac,

		octetstring privateKey

		

		// DH Private Key - Chip Authentication

		octetstring dhPrivateKey,

	

		// KPrAA - Active Authentication

		octetstring aaPrivateKey

	}

/*

	type component TestAdapter {