some comments deleted (a6bd4481) · Commits · TTCN-3 Libraries / LibIPv6

ttcn3/EtsiLibrary/LibIpv6/LibCommonRfcs/LibIpv6_ModuleParameters.ttcn

+3 −8

Original line number	Original line	Diff line number	Diff line
	@@ -29,17 +29,12 @@ group security {
	/*		/*
	* @desc Shall IPSEC be tested?		* @desc Shall IPSEC be tested?
	*/		*/
	modulepar { IpSecSwitch PX_IP_SEC := e_securityOff }		modulepar { IpSecSwitch PX_USE_IPSEC_FOR_MIP := e_securityOff }

	/*
	* @desc Which protocol (ESP or AH) shall be used?
	*/
	modulepar { IpSecProtocol PX_IP_SEC_PROTOCOL := e_esp }

	/*		/*
	* @desc Which protocol mode shall be used in vc_sad[c_saRes]?		* @desc Which protocol mode shall be used in vc_sad[c_saRes]?
	*/		*/
	modulepar { IpSecProtocolMode PX_IP_SEC_PROTOCOL_MODE := e_transportMode }		modulepar { IpSecProtocolMode PX_IPSEC_PROTOCOL_MODE := e_transportMode }

	/*		/*
	* @desc Which Algo mode shall be used for Encryption in vc_sad[c_saRes]?		* @desc Which Algo mode shall be used for Encryption in vc_sad[c_saRes]?
	@@ -101,7 +96,7 @@ group ikeSecurity
	modulepar {octetstring PX_IKE_DIFFIEHELLMAN_PRIVKEY := '0123456789ABCDEF'O}		modulepar {octetstring PX_IKE_DIFFIEHELLMAN_PRIVKEY := '0123456789ABCDEF'O}

	/*		/*
	* @desc AAre security parameters configured manually or is IKE used to negotiate security parameters?		* @desc Are security parameters configured manually or is IKE used to negotiate security parameters?
	*/		*/
	modulepar {IpSecControl PX_IPSEC_CONTROL := e_useIKEforSecParamsSetup }		modulepar {IpSecControl PX_IPSEC_CONTROL := e_useIKEforSecParamsSetup }

ttcn3/EtsiLibrary/LibIpv6/LibMobility/LibIpv6_Rfc3775Mipv6_Functions.ttcn

+26 −26

Original line number	Original line	Diff line number	Diff line
	@@ -100,7 +100,7 @@ module LibIpv6_Rfc3775Mipv6_Functions {
	var FncRetCode v_ret;		var FncRetCode v_ret;
	var NeighborSolicitation v_nbrSol;		var NeighborSolicitation v_nbrSol;

	if(PX_IP_SEC == e_securityOff) {		if(PX_USE_IPSEC_FOR_MIP == e_securityOff) {
	v_ret := f_sendBU(		v_ret := f_sendBU(
	m_bindingUpdate(		m_bindingUpdate(
	c_mobileHdr,		c_mobileHdr,
	@@ -153,7 +153,7 @@ module LibIpv6_Rfc3775Mipv6_Functions {
	if ( v_ret != e_success ) {return v_ret;}		if ( v_ret != e_success ) {return v_ret;}
	tc_ac.start;		tc_ac.start;
	alt {		alt {
	[PX_IP_SEC == e_securityOff] ipPort.receive(mw_bindingAck( c_mobileHdr,		[PX_USE_IPSEC_FOR_MIP == e_securityOff] ipPort.receive(mw_bindingAck( c_mobileHdr,
	p_haGlaNut,		p_haGlaNut,
	p_mnHoaTn,		p_mnHoaTn,
	m_extHdrList_1Elem(		m_extHdrList_1Elem(
	@@ -163,7 +163,7 @@ module LibIpv6_Rfc3775Mipv6_Functions {
	tc_ac.stop;		tc_ac.stop;
	v_ret := e_success ;		v_ret := e_success ;
	}		}
	[PX_IP_SEC == e_securityOn] ipPort.receive(mw_bindingAck(		[PX_USE_IPSEC_FOR_MIP == e_securityOn] ipPort.receive(mw_bindingAck(
	c_espHdr,		c_espHdr,
	p_haGlaNut,		p_haGlaNut,
	p_mnHoaTn,		p_mnHoaTn,
	@@ -222,7 +222,7 @@ module LibIpv6_Rfc3775Mipv6_Functions {
	return FncRetCode {		return FncRetCode {
	var FncRetCode v_ret;		var FncRetCode v_ret;

	if(PX_IP_SEC == e_securityOff){		if(PX_USE_IPSEC_FOR_MIP == e_securityOff){
	v_ret := f_sendBU(		v_ret := f_sendBU(
	m_bindingUpdate(		m_bindingUpdate(
	c_dstHdr,		c_dstHdr,
	@@ -285,7 +285,7 @@ module LibIpv6_Rfc3775Mipv6_Functions {
	if ( v_ret != e_success ) {return v_ret;}		if ( v_ret != e_success ) {return v_ret;}
	tc_ac.start;		tc_ac.start;
	alt {		alt {
	[PX_IP_SEC == e_securityOff] ipPort.receive(		[PX_USE_IPSEC_FOR_MIP == e_securityOff] ipPort.receive(
	mw_bindingAck_noData(		mw_bindingAck_noData(
	c_routeHdr,		c_routeHdr,
	p_haGlaNut,		p_haGlaNut,
	@@ -304,7 +304,7 @@ module LibIpv6_Rfc3775Mipv6_Functions {
	tc_ac.stop;		tc_ac.stop;
	v_ret := e_success ;		v_ret := e_success ;
	}		}
	[PX_IP_SEC == e_securityOn] ipPort.receive(		[PX_USE_IPSEC_FOR_MIP == e_securityOn] ipPort.receive(
	mw_bindingAck_noData(		mw_bindingAck_noData(
	c_routeHdr,		c_routeHdr,
	p_haGlaNut,		p_haGlaNut,
	@@ -1164,7 +1164,7 @@ group mobileSecurityFns {
	return FncRetCode {		return FncRetCode {
	var FncRetCode v_ret;		var FncRetCode v_ret;

	if (PX_IP_SEC == e_securityOff) {		if (PX_USE_IPSEC_FOR_MIP == e_securityOff) {
	v_ret := f_sendMipPrefixSol(m_mobilePrefixSol(		v_ret := f_sendMipPrefixSol(m_mobilePrefixSol(
	c_dstHdr,		c_dstHdr,
	p_mnCoaTn,		p_mnCoaTn,
	@@ -1203,7 +1203,7 @@ group mobileSecurityFns {
	if ( v_ret != e_success ) {return v_ret;}		if ( v_ret != e_success ) {return v_ret;}
	tc_ac.start;		tc_ac.start;
	alt {		alt {
	[PX_IP_SEC == e_securityOff] ipPort.receive(mw_mobilePrefixAdv_extHdr(		[PX_USE_IPSEC_FOR_MIP == e_securityOff] ipPort.receive(mw_mobilePrefixAdv_extHdr(
	c_routeHdr,		c_routeHdr,
	p_haGlaNut,		p_haGlaNut,
	p_mnCoaTn,		p_mnCoaTn,
	@@ -1217,7 +1217,7 @@ group mobileSecurityFns {
	tc_ac.stop;		tc_ac.stop;
	v_ret := e_success ;		v_ret := e_success ;
	}		}
	[PX_IP_SEC == e_securityOn] ipPort.receive(mw_mobilePrefixAdv_esp(		[PX_USE_IPSEC_FOR_MIP == e_securityOn] ipPort.receive(mw_mobilePrefixAdv_esp(
	c_routeHdr,		c_routeHdr,
	p_haGlaNut,		p_haGlaNut,
	p_mnCoaTn,		p_mnCoaTn,
	@@ -1262,7 +1262,7 @@ group mobileSecurityFns {
	return FncRetCode {		return FncRetCode {
	var FncRetCode v_ret;		var FncRetCode v_ret;

	if (PX_IP_SEC == e_securityOff) {		if (PX_USE_IPSEC_FOR_MIP == e_securityOff) {
	v_ret := f_sendMipPrefixSol(m_mobilePrefixSol(		v_ret := f_sendMipPrefixSol(m_mobilePrefixSol(
	c_dstHdr,		c_dstHdr,
	p_mnCoaTn,		p_mnCoaTn,
	@@ -1654,7 +1654,7 @@ group mobileSecurityFns {
	}		}

	//1st alternative: m_optPad2 + Coa		//1st alternative: m_optPad2 + Coa
	[PX_IP_SEC == e_securityOff] ipPort.receive (		[PX_USE_IPSEC_FOR_MIP == e_securityOff] ipPort.receive (
	mw_bindingUpdate_srcDst (		mw_bindingUpdate_srcDst (
	c_mobileHdr,		c_mobileHdr,
	p_paramsIut.mnHoa,		p_paramsIut.mnHoa,
	@@ -1696,7 +1696,7 @@ group mobileSecurityFns {
	}		}

	//1st alternative bis: m_optPad2 + Coa + HoADestOpt		//1st alternative bis: m_optPad2 + Coa + HoADestOpt
	[PX_IP_SEC == e_securityOff] ipPort.receive (		[PX_USE_IPSEC_FOR_MIP == e_securityOff] ipPort.receive (
	mw_bindingUpdate_srcDst (		mw_bindingUpdate_srcDst (
	c_dstHdr,		c_dstHdr,
	p_paramsIut.mnHoa,		p_paramsIut.mnHoa,
	@@ -1750,7 +1750,7 @@ group mobileSecurityFns {
	}		}

	//2nd alternative: m_optPad4		//2nd alternative: m_optPad4
	[PX_IP_SEC == e_securityOff] ipPort.receive (		[PX_USE_IPSEC_FOR_MIP == e_securityOff] ipPort.receive (
	mw_bindingUpdate_srcDst (		mw_bindingUpdate_srcDst (
	c_mobileHdr,		c_mobileHdr,
	p_paramsIut.mnHoa,		p_paramsIut.mnHoa,
	@@ -1790,7 +1790,7 @@ group mobileSecurityFns {


	//2nd alternative bis: m_optPad4 + HoADestOpt		//2nd alternative bis: m_optPad4 + HoADestOpt
	[PX_IP_SEC == e_securityOff] ipPort.receive (		[PX_USE_IPSEC_FOR_MIP == e_securityOff] ipPort.receive (
	mw_bindingUpdate_srcDst (		mw_bindingUpdate_srcDst (
	c_dstHdr,		c_dstHdr,
	p_paramsIut.mnHoa,		p_paramsIut.mnHoa,
	@@ -1841,7 +1841,7 @@ group mobileSecurityFns {
	}		}

	//1st alternative : m_optPad2 + Coa		//1st alternative : m_optPad2 + Coa
	[PX_IP_SEC == e_securityOn] ipPort.receive (		[PX_USE_IPSEC_FOR_MIP == e_securityOn] ipPort.receive (
	mw_bindingUpdate_srcDst (		mw_bindingUpdate_srcDst (
	c_espHdr,		c_espHdr,
	p_paramsIut.mnHoa,		p_paramsIut.mnHoa,
	@@ -1897,7 +1897,7 @@ group mobileSecurityFns {
	}		}

	//1st alternative bis: m_optPad2 + Coa + HoADestOpt		//1st alternative bis: m_optPad2 + Coa + HoADestOpt
	[PX_IP_SEC == e_securityOn] ipPort.receive (		[PX_USE_IPSEC_FOR_MIP == e_securityOn] ipPort.receive (
	mw_bindingUpdate_srcDst (		mw_bindingUpdate_srcDst (
	c_dstHdr,		c_dstHdr,
	p_paramsIut.mnHoa,		p_paramsIut.mnHoa,
	@@ -1966,7 +1966,7 @@ group mobileSecurityFns {


	//2nd alternative : m_optPad4		//2nd alternative : m_optPad4
	[PX_IP_SEC == e_securityOn] ipPort.receive (		[PX_USE_IPSEC_FOR_MIP == e_securityOn] ipPort.receive (
	mw_bindingUpdate_srcDst (		mw_bindingUpdate_srcDst (
	c_espHdr,		c_espHdr,
	p_paramsIut.mnHoa,		p_paramsIut.mnHoa,
	@@ -2019,7 +2019,7 @@ group mobileSecurityFns {
	}		}

	//2nd alternative bis: m_optPad4 + HoADestOpt		//2nd alternative bis: m_optPad4 + HoADestOpt
	[PX_IP_SEC == e_securityOn] ipPort.receive (		[PX_USE_IPSEC_FOR_MIP == e_securityOn] ipPort.receive (
	mw_bindingUpdate_srcDst (		mw_bindingUpdate_srcDst (
	c_dstHdr,		c_dstHdr,
	p_paramsIut.mnHoa,		p_paramsIut.mnHoa,
	@@ -2111,7 +2111,7 @@ group mobileSecurityFns {
	}		}

	//1st alternative: m_optPad2 + Coa		//1st alternative: m_optPad2 + Coa
	[PX_IP_SEC == e_securityOff] ipPort.receive (		[PX_USE_IPSEC_FOR_MIP == e_securityOff] ipPort.receive (
	mw_bindingUpdate_dst (		mw_bindingUpdate_dst (
	c_dstHdr,		c_dstHdr,
	p_paramsHa.gla,		p_paramsHa.gla,
	@@ -2167,7 +2167,7 @@ group mobileSecurityFns {
	}		}

	//2nd alternative: m_optPad4		//2nd alternative: m_optPad4
	[PX_IP_SEC == e_securityOff] ipPort.receive (		[PX_USE_IPSEC_FOR_MIP == e_securityOff] ipPort.receive (
	mw_bindingUpdate_dst (		mw_bindingUpdate_dst (
	c_dstHdr,		c_dstHdr,
	p_paramsHa.gla,		p_paramsHa.gla,
	@@ -2222,7 +2222,7 @@ group mobileSecurityFns {
	}		}

	//1st alternative: m_optPad2 + Coa		//1st alternative: m_optPad2 + Coa
	[PX_IP_SEC == e_securityOn] ipPort.receive (		[PX_USE_IPSEC_FOR_MIP == e_securityOn] ipPort.receive (
	mw_bindingUpdate_dst (		mw_bindingUpdate_dst (
	c_dstHdr,		c_dstHdr,
	p_paramsHa.gla,		p_paramsHa.gla,
	@@ -2293,7 +2293,7 @@ group mobileSecurityFns {
	}		}

	// 2nd alternative: m_optPad4		// 2nd alternative: m_optPad4
	[PX_IP_SEC == e_securityOn] ipPort.receive (		[PX_USE_IPSEC_FOR_MIP == e_securityOn] ipPort.receive (
	mw_bindingUpdate_dst (		mw_bindingUpdate_dst (
	c_dstHdr,		c_dstHdr,
	p_paramsHa.gla,		p_paramsHa.gla,
	@@ -2724,7 +2724,7 @@ group mobileSecurityFns {
	//Variables		//Variables
	var Ipv6Packet v_ipv6Packet;		var Ipv6Packet v_ipv6Packet;

	[PX_IP_SEC == e_securityOn] ipPort.receive (		[PX_USE_IPSEC_FOR_MIP == e_securityOn] ipPort.receive (
	mw_homeTestInit_noData (		mw_homeTestInit_noData (
	c_espHdr,		c_espHdr,
	p_paramsIut.mnCoa,		p_paramsIut.mnCoa,
	@@ -2755,7 +2755,7 @@ group mobileSecurityFns {

	}		}

	[PX_IP_SEC == e_securityOff] ipPort.receive (		[PX_USE_IPSEC_FOR_MIP == e_securityOff] ipPort.receive (
	mw_homeTestInit_noData (		mw_homeTestInit_noData (
	c_tunneledIpHdr,		c_tunneledIpHdr,
	p_paramsIut.mnCoa,		p_paramsIut.mnCoa,
	@@ -2796,7 +2796,7 @@ group mobileSecurityFns {
	//Variables		//Variables
	var Ipv6Packet v_ipv6Packet;		var Ipv6Packet v_ipv6Packet;

	[PX_IP_SEC == e_securityOn] a_cnReceiveHoTiViaHaOffHome(p_paramsCn, p_paramsHa, p_paramsIut) {		[PX_USE_IPSEC_FOR_MIP == e_securityOn] a_cnReceiveHoTiViaHaOffHome(p_paramsCn, p_paramsHa, p_paramsIut) {
	f_sendHot (		f_sendHot (
	m_homeTest (		m_homeTest (
	c_espHdr,		c_espHdr,
	@@ -2824,7 +2824,7 @@ group mobileSecurityFns {

	}		}

	[PX_IP_SEC == e_securityOff] a_cnReceiveHoTiViaHaOffHome(p_paramsCn, p_paramsHa, p_paramsIut) {		[PX_USE_IPSEC_FOR_MIP == e_securityOff] a_cnReceiveHoTiViaHaOffHome(p_paramsCn, p_paramsHa, p_paramsIut) {
	f_sendHot (		f_sendHot (
	m_homeTest (		m_homeTest (
	c_tunneledIpHdr,		c_tunneledIpHdr,

ttcn3/EtsiLibrary/LibIpv6/LibSec/LibIpv6_Rfc4306Ikev2_TypesAndValues.ttcn

+1 −22

Original line number	Original line	Diff line number	Diff line
	@@ -375,20 +375,6 @@
	group IkeRfc4306EncrAlgorithms {		group IkeRfc4306EncrAlgorithms {

	type enumerated EncryptionAlgo {		type enumerated EncryptionAlgo {
	//e_reserved(0),
	//e_encrAlgoDesIv64(1),
	//e_encrAlgoDes(2),
	//e_encrAlgo3Des(3),
	//e_encrAlgoRc5(4),
	//e_encrAlgoIdea(5),
	//e_encrAlgoCast(6),
	//e_encrAlgoBlowfish(7),
	//e_encrAlgo3Idea(8),
	//e_encrAlgoDesIv32(9),
	//e_encrAlgoNull(11),
	//e_encrAlgoAesCbc(12),
	//e_encrAlgoAesCtr(13)

	e_reserved(0), // not yet supported by ETSI ATS		e_reserved(0), // not yet supported by ETSI ATS
	e_encr_desIv64(1), // not yet supported by ETSI ATS		e_encr_desIv64(1), // not yet supported by ETSI ATS
	e_encr_des(2), // iv needed //cbc		e_encr_des(2), // iv needed //cbc
	@@ -425,13 +411,6 @@
	group IkeRfc4306IntegAlgorithms {		group IkeRfc4306IntegAlgorithms {

	type enumerated IntegrityAlgo {		type enumerated IntegrityAlgo {
	//e_none(0),
	//e_integAlgoHmacMd596(1),
	//e_integAlgoHmacSha196(2),
	//e_integAlgoDesMac(3),
	//e_integAlgoKpdkMd5(4),
	//e_integAlgoAesXcbc96(5)

	e_none(0), // Used by IKE		e_none(0), // Used by IKE
	e_auth_hmacMd5_96(1), // Used by IKE //RFC4305		e_auth_hmacMd5_96(1), // Used by IKE //RFC4305
	e_auth_hmacSha1_96(2), // Used by IKE		e_auth_hmacSha1_96(2), // Used by IKE
	@@ -980,7 +959,7 @@
	group cryptoTypes {		group cryptoTypes {

	/*		/*
	* @desc High level switch to select/deselect Security TCs/Fns		* @desc High level switch to enable/disable security for MIP TCs/Fns
	*/		*/
	type enumerated IpSecSwitch {		type enumerated IpSecSwitch {
	e_securityOn(0),		e_securityOn(0),

Admin message