Commit 1b946c9b authored by schmitting's avatar schmitting
Browse files

f_ikeAuthUp_forEsp updated

parent abc19bea

ttcn3/EtsiLibrary/LibIpv6/LibCommonRfcs/LibIpv6_CommonRfcs_Functions.ttcn

+4 −2
Original line number Diff line number Diff line
@@ -448,8 +448,10 @@ group ipSecFns { 
			proposalNr := 1,//smu not needed anymore delete

			udpTnPort := PX_UDP_PORT_IUT_1,

			udpIutPort := PX_UDP_PORT_HS02,

			iDi := PX_IDENTIFICATION_DATA, //new ps identification initiator

			iDr := PX_IDENTIFICATION_DATA //new ps identification responder

			iDi := PX_IDENTIFICATION_DATA,

			iDr := PX_IDENTIFICATION_DATA,

			ikev2Header := omit,

			ikePayloadList := omit

		}



		//ESP - AH

ttcn3/EtsiLibrary/LibIpv6/LibSec/LibIpv6_Rfc4306Ikev2_Functions.ttcn

+9 −7
Original line number Diff line number Diff line
@@ -387,8 +387,7 @@ module LibIpv6_Rfc4306Ikev2_Functions { 
	 * @param p_nonceData data field of Nonce payload

	 * @param p_identificationData data field of Identification payload

	*/

	function f_calculateAUTH(in IkeSa p_IkeSa, in Ikev2Header p_ikev2Header, in IkePayloadList p_ikePayloadList,

							 in boolean p_initatorOrResponder)

	function f_calculateAUTH(in IkeSa p_IkeSa, in boolean p_initatorOrResponder)

	runs on LibIpv6Node

	return octetstring {

		var octetstring v_aUTH;
@@ -413,8 +412,8 @@ module LibIpv6_Rfc4306Ikev2_Functions { 
								  fx_pseudoRandom(p_IkeSa.ikePseudoRandomFunction,

												  PX_SHARED_SECRET,

												  c_authString),

								  (fx_ikev2HeaderToOct(p_ikev2Header) & 

								   fx_ikePayloadListToOct(p_ikePayloadList) &

								  (fx_ikev2HeaderToOct(p_IkeSa.ikev2Header) & 

								   fx_ikePayloadListToOct(p_IkeSa.ikePayloadList) &

								   v_auxiliary)); 



		return v_aUTH;
@@ -937,6 +936,9 @@ group sendRequests { 
		ipPort.send(v_ipPkt);



		vc_ikeSad[0].messageID := vc_ikeSad[0].messageID + 1;

		// Save IKEv2 header and payload list in ikeSad for later use in AUTH calculation

		vc_ikeSad[0].ikev2Header := v_ipPkt.ipv6Payload.ikeMsg.ikev2Header;

		vc_ikeSad[0].ikePayloadList:= v_ipPkt.ipv6Payload.ikeMsg.payloadList;



		return e_success;
@@ -1141,7 +1143,7 @@ group establishSAFns { 
							),

							m_authPL (	

								c_authenticationPL,

								'00'O//smu to fix

								f_calculateAUTH(vc_ikeSad[0],c_initiator)

							),

							m_securityAssociationPL(

								c_tsInitiatorPL,

ttcn3/EtsiLibrary/LibIpv6/LibSec/LibIpv6_Rfc4306Ikev2_TypesAndValues.ttcn

+4 −2
Original line number Diff line number Diff line
@@ -48,7 +48,7 @@ 
		const UInt8 c_protocolId_esp := 3;



		const boolean c_initiator := true;

		const boolean c_responder := true;

		const boolean c_responder := false;

		const octetstring c_authString := '4865792050414420466F72204948457632'O // ASCII coding for string 'Key Pad for IKEv2'



	} // end group IkeRfc4306CommonConstants
@@ -1103,7 +1103,9 @@ 
			UInt16 udpTnPort, // UDP port of test node (TN)

			UInt16 udpIutPort, // UDP port of IUT

			octetstring iDi, //new ps identification initiator

			octetstring iDr //new ps identification responder

			octetstring iDr, //new ps identification responder

			Ikev2Header ikev2Header optional, //new ps IKEv2 header from IKE_SA_INIT message

			IkePayloadList ikePayloadList optional //new ps IKEv2 payload list from IKE_SA_INIT message

		}

		with {

			variant "noCodec";