Commit 7c1b91d8 authored by schmitting's avatar schmitting
Browse files

Further IKE TCs added

parent 8c9fc4b9

ttcn3/EtsiLibrary/LibIpv6/LibSec/LibIpv6_Rfc4306Ikev2_Functions.ttcn

+97 −13
Original line number Diff line number Diff line
@@ -2182,7 +2182,7 @@ module LibIpv6_Rfc4306Ikev2_Functions { 
													vc_ikeSad[0].spiResponder,

													p_iFlag,

													vc_ikeSad[0].messageID,

													mw_encryptedPLL(p_ikePayloadList))) -> value v_ipv6Packet

													p_ikePayloadList)) -> value v_ipv6Packet

				{

					tc_wait.stop;

				}
@@ -2264,7 +2264,7 @@ module LibIpv6_Rfc4306Ikev2_Functions { 
													vc_ikeSad[0].spiResponder,

													p_iFlag,

													vc_ikeSad[0].messageID,

													mw_encryptedPLL(p_IkePayloadList)))

													p_IkePayloadList))



				{

					tc_wait.stop;
@@ -2612,6 +2612,7 @@ group sendRequests { 
		if (v_ret != e_success) { return v_ret;}



		return v_ret;



	} // end f_createAndSendIkeSaInitReq



	}//end 	group saInitReq
@@ -3810,6 +3811,7 @@ group sendRequests { 
} // end group sendRequests



group sendResponses {

	group saInitRsp {



	/*

	 * @desc  Test Node builds IKE_SA_INIT response
@@ -3818,11 +3820,12 @@ group sendResponses { 
	 * @param p_addrTunnelStart address of tunnel start point

	 * @param p_addrTunnelEnd address of tunnel end point

	*/

	function f_createAndSendSaInitRsp(

	function f_createSaInitRsp(

		in template Ipv6Address p_addrTn,

		in template Ipv6Address p_addrIut,

		in template Ipv6Address p_addrTunnelStart,

		in template Ipv6Address p_addrTunnelEnd

		in template Ipv6Address p_addrTunnelEnd,

		out IkeSaInitResponse 	p_ikeSaInitRsp

	)

	runs on LibIpv6Node

	return FncRetCode {
@@ -3858,7 +3861,7 @@ group sendResponses { 
			v_ikeDst := valueof(p_addrTunnelEnd);

		}

									

		v_ret := f_sendIkeSaInitRsp (

		p_ikeSaInitRsp := valueof (

			m_ikeSaInitRsp (

				v_ikeSrc,

				v_ikeDst,
@@ -3920,7 +3923,7 @@ group sendResponses { 
		if (v_ret != e_success) { return v_ret;}



		return v_ret;

	} // end f_createAndSendIkeSaInitRsp

	} // end f_createIkeSaInitRsp



	/*

	 * @desc  Test Node sends IKE_SA_INIT response
@@ -3955,6 +3958,43 @@ group sendResponses { 
		return e_success;

	} // end f_sendIkeSaInitRsp



	/*

	 * @desc  Test Node builds and sends IKE_SA_INIT response

 	 * @param p_addrIut address of IUT

	 * @param p_addrTn address of test node

	 * @param p_addrTunnelStart address of tunnel start point

	 * @param p_addrTunnelEnd address of tunnel end point

	*/

	function f_createAndSendSaInitRsp(

		in template Ipv6Address p_addrTn,

		in template Ipv6Address p_addrIut,

		in template Ipv6Address p_addrTunnelStart,

		in template Ipv6Address p_addrTunnelEnd

	)

	runs on LibIpv6Node

	return FncRetCode {



		var FncRetCode v_ret := e_error;

		var IkeSaInitResponse v_ikeSaInitRsp;



		f_createSaInitRsp(

			p_addrTn,

			p_addrIut,

			p_addrTunnelStart,

			p_addrTunnelEnd,

			v_ikeSaInitRsp

		);

										

		v_ret := f_sendIkeSaInitRsp (v_ikeSaInitRsp);

		if (v_ret != e_success) { return v_ret;}



		return v_ret;



	} // end f_createAndSendIkeSaInitRsp



	} // end group saInitRsp

	group ikeAuthRsp {



	/*

	 * @desc  Test Node builds IKE_AUTH response

 	 * @param p_addrIut address of IUT
@@ -3963,12 +4003,13 @@ group sendResponses { 
	 * @param p_addrTunnelEnd address of tunnel end point

	 * @param p_protocolId chosen security protocol, AH or ESP

	*/

	function f_createAndSendAuthRsp(

	function f_createAuthRsp(

		in template Ipv6Address p_addrTn,

		in template Ipv6Address p_addrIut,

		in template Ipv6Address p_addrTunnelStart,

		in template Ipv6Address p_addrTunnelEnd,

		UInt8 p_protocolId

		in 			UInt8 		p_protocolId,

		out IkeAuthResponse 	p_ikeAuthRsp

	)

	runs on LibIpv6Node

	return FncRetCode {
@@ -4073,7 +4114,7 @@ group sendResponses { 
		// Transport mode, Notify payload requesting 'UseTransportMode' is included in IKE_AUTH response

		if(vc_sad[c_saIni].ipSecProtocolMode == e_transportMode)

		{

			v_ret := f_sendIkeAuthRsp (

			p_ikeAuthRsp := valueof (

				m_ikeAuthRsp (

					v_ikeSrc,

					v_ikeDst,
@@ -4123,7 +4164,7 @@ group sendResponses { 
		// Tunnel mode, Notify payload requesting 'UseTransportMode' is not included in IKE_AUTH response

		else

		{

			v_ret := f_sendIkeAuthRsp (

			p_ikeAuthRsp := valueof (

				m_ikeAuthRsp (

					v_ikeSrc,

					v_ikeDst,
@@ -4166,7 +4207,7 @@ group sendResponses { 
		}



		return v_ret ;

	} // end f_createAndSendAuthRsp

	} // end f_createAuthRsp



	/*

	 * @desc  Test Node sends IKE_AUTH response
@@ -4194,6 +4235,45 @@ group sendResponses { 
		return e_success;

	} // end f_sendIkeAuthRsp



	/*

	 * @desc  Test Node builds IKE_AUTH response

 	 * @param p_addrIut address of IUT

	 * @param p_addrTn address of test node

	 * @param p_addrTunnelStart address of tunnel start point

	 * @param p_addrTunnelEnd address of tunnel end point

	 * @param p_protocolId chosen security protocol, AH or ESP

	*/

	function f_createAndSendAuthRsp(

		in template Ipv6Address p_addrTn,

		in template Ipv6Address p_addrIut,

		in template Ipv6Address p_addrTunnelStart,

		in template Ipv6Address p_addrTunnelEnd,

		in			UInt8 		p_protocolId

	)

	runs on LibIpv6Node

	return FncRetCode {



		var FncRetCode v_ret := e_error;

		var IkeAuthResponse v_ikeAuthRsp;



		f_createAuthRsp(

			p_addrTn,

			p_addrIut,

			p_addrTunnelStart,

			p_addrTunnelEnd,	

			p_protocolId,

			v_ikeAuthRsp

		);



		v_ret := f_sendIkeAuthRsp (v_ikeAuthRsp);



		return v_ret ;



	} // end f_createAndSendAuthRsp



	} // end group ikeAuthRsp

	group createChildSaRsp {



	/*

	 * @desc  Test Node builds CREATE_CHILD_SA response

 	 * @param p_addrIut address of IUT
@@ -5038,6 +5118,9 @@ group sendResponses { 
		return e_success;

	} // end f_sendCreateChildSaRsp



	} // end group createChildSaRsp

	group infoRsp {



	/*

	 * @desc  Test Node builds INFORMATIONAL response

 	 * @param p_addrIut address of IUT
@@ -5122,6 +5205,7 @@ group sendResponses { 
		return e_success;

	} // end f_sendInformationalRsp



	} // end group infoRsp

} // end group sendResponses



group establishSAFns_active {

ttcn3/EtsiLibrary/LibIpv6/LibSec/LibIpv6_Rfc4306Ikev2_Templates.ttcn

+1 −1
Original line number Diff line number Diff line
@@ -414,7 +414,7 @@ 
												UInt8 p_nextPayload,

												UInt32 p_messageID,

												template IkePayloadList p_ikepayloads) := {

			ipv6Hdr :=  mw_ipHdr_nextHdr_srcDst(c_udpHdr, p_src, p_dst),

			ipv6Hdr :=  m_ipHdr_nextHdr_srcDst(c_udpHdr, p_src, p_dst),

			extHdrList        := omit,

			ipv6Payload       := { ikeMsg := {

				sourcePort    := p_udpsourcePort,