Commit 65020ec7 authored by berge's avatar berge
Browse files

6401_01 and 6405_01 validated

parent 2828a706

ttcn3/EtsiLibrary/LibIpv6/LibCommonRfcs/LibIpv6_CommonRfcs_Functions.ttcn

+2 −2
Original line number Original line Diff line number Diff line
@@ -727,8 +727,8 @@ group ipSecFns { 
				nR := int2oct(float2int(int2float(20000-5000)*rnd())+5000, 16),

				nR := int2oct(float2int(int2float(20000-5000)*rnd())+5000, 16),

				udpTnPort := PX_UDP_PORT_IUT_1,

				udpTnPort := PX_UDP_PORT_IUT_1,

				udpIutPort := PX_UDP_PORT_HS02,

				udpIutPort := PX_UDP_PORT_HS02,

				iDi := PX_IDENTIFICATION_DATA,

				iDi := '00'O,//will be assigned before send of pkt

				iDr := PX_IDENTIFICATION_DATA,

				iDr := '00'O,//will be assigned before send of pkt

				ikev2Header := omit,

				ikev2Header := omit,

				ikePayloadList := omit	

				ikePayloadList := omit	

			}

			}

ttcn3/EtsiLibrary/LibIpv6/LibCommonRfcs/LibIpv6_ModuleParameters.ttcn

+0 −5
Original line number Original line Diff line number Diff line
@@ -115,11 +115,6 @@ group ikeSecurity 
    */

    */

	modulepar {octetstring PX_PRE_SHARED_KEY := '0123456789ABCDEF'O}

	modulepar {octetstring PX_PRE_SHARED_KEY := '0123456789ABCDEF'O}





	/*

	 * @desc Which identification data (type = ID_IPV6_ADDR) shall be used for sending in Identification payloads?

    */

	modulepar {octetstring PX_IDENTIFICATION_DATA := '00112233445566778899AABBCCDDEEFF'O}



} // end group ikeSecurity

} // end group ikeSecurity





group ikeUdpPorts {

group ikeUdpPorts {

ttcn3/EtsiLibrary/LibIpv6/LibSec/LibIpv6_Rfc4306Ikev2_Functions.ttcn

+17 −5
Original line number Original line Diff line number Diff line
@@ -393,6 +393,7 @@ module LibIpv6_Rfc4306Ikev2_Functions { 
	return octetstring {

	return octetstring {

		var octetstring v_aUTH;

		var octetstring v_aUTH;

		var octetstring v_auxiliary;

		var octetstring v_auxiliary;

		var octetstring tmp;

		

		

		if(p_initatorOrResponder == c_initiator)

		if(p_initatorOrResponder == c_initiator)

		{

		{
@@ -402,6 +403,8 @@ module LibIpv6_Rfc4306Ikev2_Functions { 
										   // Header of Identification PL must be added

										   // Header of Identification PL must be added

									       int2oct(c_identificationIpv6Addr,1) & c_3ZeroBytes &

									       int2oct(c_identificationIpv6Addr,1) & c_3ZeroBytes &

										   p_IkeSa.iDi);

										   p_IkeSa.iDi);

			log(int2oct(c_identificationIpv6Addr,1) & c_3ZeroBytes &p_IkeSa.iDi);

			log( v_auxiliary);

		}

		}

		else // IUT acts as responder

		else // IUT acts as responder

		{

		{
@@ -411,10 +414,13 @@ module LibIpv6_Rfc4306Ikev2_Functions { 
										   p_IkeSa.iDr);

										   p_IkeSa.iDr);

		}

		}





		v_aUTH := fx_pseudoRandom(p_IkeSa.ikePseudoRandomFunction,

		tmp := fx_pseudoRandom(p_IkeSa.ikePseudoRandomFunction,

								  fx_pseudoRandom(p_IkeSa.ikePseudoRandomFunction,

		PX_PRE_SHARED_KEY,

		PX_PRE_SHARED_KEY,

												  c_authString),

		c_authString);



		log(tmp);

		v_aUTH := fx_pseudoRandom(p_IkeSa.ikePseudoRandomFunction,

								  tmp,

								  (fx_ikev2HeaderToOct(p_IkeSa.ikev2Header) & 

								  (fx_ikev2HeaderToOct(p_IkeSa.ikev2Header) & 

								   fx_ikePayloadListToOct(p_IkeSa.ikePayloadList) &

								   fx_ikePayloadListToOct(p_IkeSa.ikePayloadList) &

								   v_auxiliary)); 

								   v_auxiliary));
@@ -2235,6 +2241,9 @@ group sendRequests { 
			v_ipPkt.ipv6Payload.ikeMsg.padding := c_4ZeroBytes;

			v_ipPkt.ipv6Payload.ikeMsg.padding := c_4ZeroBytes;

		}

		}

		

		

		// save Identification data to ikeSAD. It can be LLA or GLA

		vc_ikeSad[0].iDi := v_ipPkt.ipv6Hdr.sourceAddress; 

		

		//send

		//send

		ipPort.send(v_ipPkt);

		ipPort.send(v_ipPkt);
@@ -3105,7 +3114,7 @@ group sendRequests { 
							c_notifyPL,

							c_notifyPL,

							m_ikePlList_4Elem(

							m_ikePlList_4Elem(

								m_notifyPL(

								m_notifyPL(

									c_idInitiatorPL, 

									c_saPL, 

									0, //c_protocolId_none, 

									0, //c_protocolId_none, 

									c_notifyUseTransportMode

									c_notifyUseTransportMode

								),							

								),
@@ -3522,6 +3531,9 @@ group sendResponses { 
			v_ipPkt.ipv6Payload.ikeMsg.padding := c_4ZeroBytes;

			v_ipPkt.ipv6Payload.ikeMsg.padding := c_4ZeroBytes;

		}

		}

		

		

		// save Identification data to ikeSAD. It can be LLA or GLA

		vc_ikeSad[0].iDr := v_ipPkt.ipv6Hdr.sourceAddress;



		//send

		//send

		ipPort.send(v_ipPkt);

		ipPort.send(v_ipPkt);