Commit f7b7f25d authored by mullers's avatar mullers
Browse files

IKE keys added to IkeSa

parent 8b22dd87

ttcn3/EtsiLibrary/LibIpv6/LibCommonRfcs/LibIpv6_ModuleParameters.ttcn

+6 −2
Original line number Diff line number Diff line
@@ -93,6 +93,8 @@ module LibIpv6_ModuleParameters { 
	*/

	modulepar {IkeEncryptionAlgo PX_IKE_ENCALGO := e_encrAlgoDesIv64}



	modulepar {octetstring PX_IKE_ENC_KEY := '010203040506'O}



	/*

	 * @desc Which pseudo random function shall be used for testing IKE?

	*/
@@ -103,6 +105,8 @@ module LibIpv6_ModuleParameters { 
	*/

	modulepar {IkeIntegrityAlgo PX_IKE_INTALGO := e_integAlgoHmacMd596}



	modulepar {octetstring PX_IKE_INT_KEY := '010203040506'O}



	/*

	 * @desc Which Diffie-Hellman group shall be used for testing IKE?

	*/

ttcn3/EtsiLibrary/LibIpv6/LibSec/LibIpv6_Rfc4306Ikev2_Functions.ttcn

+5 −2
Original line number Diff line number Diff line
@@ -45,10 +45,10 @@ module LibIpv6_Rfc4306Ikev2_Functions { 
		// vc_ikeSad[0].spiResponder := ; fill from IKE Header

		vc_ikeSad[c_saOut].messageID := 0; 

		vc_ikeSad[c_saOut].ikeEncryptionAlgo := PX_IKE_ENCALGO; 

		// p_ikeSa.ikeEncryptionKey := ; ToDo!!!

		vc_ikeSad[c_saOut].ikeEncryptionKey := PX_IKE_ENC_KEY;

		vc_ikeSad[c_saOut].ikePseudoRandomFunction := PX_IKE_PSEUDORANDOM_FCT; 

		vc_ikeSad[c_saOut].ikeIntegrityAlgo := PX_IKE_INTALGO; 

		// p_ikeSa.ikeIntegrityKey := ; ToDo!!!

		vc_ikeSad[c_saOut].ikeIntegrityKey := PX_IKE_INT_KEY;

		vc_ikeSad[c_saOut].diffieHellmanGroup := PX_IKE_DIFFIEHELLMAN_GROUP; 

		vc_ikeSad[c_saOut].diffieHellmanPrivKey := PX_IKE_DIFFIEHELLMAN_PRIVKEY;

		vc_ikeSad[c_saOut].nI := int2oct(float2int(int2float(20000-5000)*rnd())+5000, 16);
@@ -846,6 +846,9 @@ group calcIkeFns { 
			for(i:=0;i<sizeof(p_payload.securityAssociation.saProposalList[i]); i := i+1) {

				//smu add transforms here

				p_payload.securityAssociation.saProposalList[i].proposalLength := lengthof(fx_saProposalToOct(p_payload.securityAssociation.saProposalList[i]));

				for(j:=0;j<sizeof(p_payload.securityAssociation.saProposalList[j]); j := j+1) {

					

				}

			}

		}

		else if (ischosen(p_payload.keyExchange)) {