Commit ecc7eaaa authored by berge's avatar berge
Browse files

misc validation changes

parent 775c17d7

ttcn3/EtsiLibrary/LibIpv6/LibCommonRfcs/LibIpv6_Interface_Functions.ttcn

+2 −2
Original line number Diff line number Diff line
@@ -177,8 +177,8 @@ group rfc2460Root_Functions { 
						v_activeIpv6Packet.extHdrList[i].espHeader.espPayload.iv := omit; 

					}

					else {

						v_activeIpv6Packet.extHdrList[i].espHeader.espPayload.iv := 

							int2oct(128, f_getEncryptionIvLen(vc_sad[v_activeIpv6Packet.extHdrList[i].espHeader.spi].espEncryptionAlgo)); 	

						v_activeIpv6Packet.extHdrList[i].espHeader.espPayload.iv := vc_sad[c_saOut].espIv;

						//int2oct(128, f_getEncryptionIvLen(vc_sad[v_activeIpv6Packet.extHdrList[i].espHeader.spi].espEncryptionAlgo)); 	

					}

						

					v_ret := f_getOriginalIpv6Packet(

ttcn3/EtsiLibrary/LibIpv6/LibSec/LibIpv6_Rfc4306Ikev2_Functions.ttcn

+16 −16
Original line number Diff line number Diff line
@@ -949,7 +949,7 @@ module LibIpv6_Rfc4306Ikev2_Functions { 
		// get Identification payload data

		v_ret_local := f_getPayload(v_ikePayloadList,v_nextPayload,c_idResponderPL,v_ikePayload);

		if (v_ret_local == e_success)

		{ vc_ikeSad[0].iDr := v_ikePayload.idInitiator.data; }

		{ vc_ikeSad[0].iDr := v_ikePayload.idResponder.data; }

		else

		{ log("**** f_analyzeIkeAuthRsp: ERROR: No Identification payload in payload list **** ");

		  v_ret := e_error;}
@@ -1337,7 +1337,7 @@ group sendRequests { 
					c_proposalNr1,

					c_protocolId_esp,

					c_spiSize4,

					c_2Transforms,

					c_3Transforms,

					int2oct(vc_sad[c_saOut].spi,c_spiSize4),

					m_saTransformList_3Elem (

						v_saTransformEncr,
@@ -1422,8 +1422,8 @@ group sendRequests { 
									c_tsResponderPL,

									m_trafficSelectorList_1Elem (

										m_icmpv6Ts(

											oct2int(int2oct(c_echoRequestMsg,2) & int2oct(c_icmpCode0,2)),

											oct2int(int2oct(c_echoRequestMsg,2) & int2oct(c_icmpCode0,2)),

											oct2int(int2oct(c_echoRequestMsg,1) & int2oct(c_icmpCode0,1)),

											oct2int(int2oct(c_echoRequestMsg,1) & int2oct(c_icmpCode0,1)),

											p_addrTn,

											p_addrTn

										)
@@ -1433,8 +1433,8 @@ group sendRequests { 
									c_noNextPL,

									m_trafficSelectorList_1Elem (

										m_icmpv6Ts(

											oct2int(int2oct(c_echoRequestMsg,2) & int2oct(c_icmpCode0,2)),

											oct2int(int2oct(c_echoRequestMsg,2) & int2oct(c_icmpCode0,2)),

											oct2int(int2oct(c_echoRequestMsg,1) & int2oct(c_icmpCode0,1)),

											oct2int(int2oct(c_echoRequestMsg,1) & int2oct(c_icmpCode0,1)),

											p_addrIut,

											p_addrIut

										)
@@ -1477,8 +1477,8 @@ group sendRequests { 
									c_tsResponderPL,

									m_trafficSelectorList_1Elem (

										m_icmpv6Ts(

											oct2int(int2oct(c_echoRequestMsg,2) & int2oct(c_icmpCode0,2)),

											oct2int(int2oct(c_echoRequestMsg,2) & int2oct(c_icmpCode0,2)),

											oct2int(int2oct(c_echoRequestMsg,1) & int2oct(c_icmpCode0,1)),

											oct2int(int2oct(c_echoRequestMsg,1) & int2oct(c_icmpCode0,1)),

											p_addrTn,

											p_addrTn

										)
@@ -1488,8 +1488,8 @@ group sendRequests { 
									c_noNextPL,

									m_trafficSelectorList_1Elem (

										m_icmpv6Ts(

											oct2int(int2oct(c_echoRequestMsg,2) & int2oct(c_icmpCode0,2)),

											oct2int(int2oct(c_echoRequestMsg,2) & int2oct(c_icmpCode0,2)),

											oct2int(int2oct(c_echoRequestMsg,1) & int2oct(c_icmpCode0,1)),

											oct2int(int2oct(c_echoRequestMsg,1) & int2oct(c_icmpCode0,1)),

											p_addrIut,

											p_addrIut

										)
@@ -1715,7 +1715,7 @@ group sendResponses { 
									c_proposalNr1,

									c_protocolId_esp,

									c_spiSize4,

									c_2Transforms,

									c_3Transforms,

									int2oct(vc_sad[c_saIn].spi,c_spiSize4),

									m_saTransformList_3Elem (

										v_saTransformEncr,

ttcn3/EtsiLibrary/LibIpv6/LibSec/LibIpv6_Rfc4306Ikev2_TypesAndValues.ttcn

+1 −0
Original line number Diff line number Diff line
@@ -243,6 +243,7 @@ 


				const UInt8 c_maxIkeSaProposals  := 10; //FIXME

				const UInt8 c_2Transforms := 2;

				const UInt8 c_3Transforms := 3;

				const UInt8 c_4Transforms := 4;



				/*