Added Notify Payload in SA_AUTH_Request message in order to be able to negotiate transport mode. (559edf80) · Commits · TTCN-3 Libraries / LibIPv6

ttcn3/EtsiLibrary/LibIpv6/LibSec/LibIpv6_Rfc4306Ikev2_Functions.ttcn

+23 −5

Original line number	Diff line number	Diff line
		@@ -1334,8 +1334,13 @@ group establishSAFns_active {
		vc_ikeSad[0].messageID,
		m_ikePlList_1Elem(
		m_encryptedPL(
		c_notifyPL,
		m_ikePlList_6Elem(
		m_notifyPL(
		c_idInitiatorPL,
		m_ikePlList_5Elem(
		0, //c_protocolId_none,
		c_notifyUseTransportMode
		),
		m_idInitiatorPL (
		c_authenticationPL,
		p_addrTn
		@@ -1352,7 +1357,8 @@ group establishSAFns_active {
		c_protocolId_esp,
		c_spiSize4,
		c_2Transforms,
		int2oct(vc_sad[c_saOut].spi,c_spiSize4),
		//int2oct(vc_sad[c_saOut].spi,c_spiSize4),
		int2oct(42,c_spiSize4),
		m_saTransformList_2Elem (
		v_saTransformEncr,
		m_saTransform (
		@@ -1366,23 +1372,35 @@ group establishSAFns_active {
		),
		m_tsInitiatorPL(
		c_tsResponderPL,
		m_trafficSelectorList_1Elem (
		m_trafficSelectorList_2Elem (
		m_icmpv6Ts(
		0,//oct2int(in2oct(c_echoRequestMsg) & int2oct(c_icmpCode)),
		65535,
		p_addrTn,
		p_addrTn
		),
		m_icmpv6Ts(
		32768,//oct2int(in2oct(c_echoRequestMsg) & int2oct(c_icmpCode)),
		33023,
		p_addrTn,
		p_addrTn
		)
		)
		),
		m_tsResponderPL(
		c_noNextPL,
		m_trafficSelectorList_1Elem (
		m_trafficSelectorList_2Elem (
		m_icmpv6Ts(
		0,//c_echoRequestMsg,
		65535,
		p_addrIut,
		p_addrIut
		),
		m_icmpv6Ts(
		32768,//c_echoRequestMsg,
		33023,
		p_addrIut,
		p_addrIut
		)
		)
		)

ttcn3/EtsiLibrary/LibIpv6/LibSec/LibIpv6_Rfc4306Ikev2_Templates.ttcn

+41 −3

Original line number	Diff line number	Diff line
		@@ -495,7 +495,7 @@ group payloadTemplates {
		* @param p_ikePayload1 First element in IkePayloadList
		* @param p_ikePayload2 Second element in IkePayloadList
		* @param p_ikePayload3 Third element in IkePayloadList
		* @param p_ikePayload4 Third element in IkePayloadList
		* @param p_ikePayload4 Fourth element in IkePayloadList
		*/
		template IkePayloadList m_ikePlList_4Elem(
		template IkePayload p_ikePayload1,
		@@ -512,8 +512,8 @@ group payloadTemplates {
		* @param p_ikePayload1 First element in IkePayloadList
		* @param p_ikePayload2 Second element in IkePayloadList
		* @param p_ikePayload3 Third element in IkePayloadList
		* @param p_ikePayload4 Third element in IkePayloadList
		* @param p_ikePayload5 Third element in IkePayloadList
		* @param p_ikePayload4 Fourth element in IkePayloadList
		* @param p_ikePayload5 Fifth element in IkePayloadList
		*/
		template IkePayloadList m_ikePlList_5Elem(
		template IkePayload p_ikePayload1,
		@@ -528,6 +528,29 @@ group payloadTemplates {
		p_ikePayload5
		}

		/*
		* @param p_ikePayload1 First element in IkePayloadList
		* @param p_ikePayload2 Second element in IkePayloadList
		* @param p_ikePayload3 Third element in IkePayloadList
		* @param p_ikePayload4 Fourth element in IkePayloadList
		* @param p_ikePayload5 Fifth element in IkePayloadList
		* @param p_ikePayload6 Sixth element in IkePayloadList
		*/
		template IkePayloadList m_ikePlList_6Elem(
		template IkePayload p_ikePayload1,
		template IkePayload p_ikePayload2,
		template IkePayload p_ikePayload3,
		template IkePayload p_ikePayload4,
		template IkePayload p_ikePayload5,
		template IkePayload p_ikePayload6) := {
		p_ikePayload1,
		p_ikePayload2,
		p_ikePayload3,
		p_ikePayload4,
		p_ikePayload5,
		p_ikePayload6
		}


		group ikeKeyExchangePayloadTemplates {

		@@ -586,6 +609,21 @@ group payloadTemplates {

		group ikeNotifyPayloadTemplates {

		template IkePayload m_notifyPL(UInt8 p_nextPL, UInt8 p_protoID, UInt16 p_notifyType) := {
		notify := {
		nextPayload := p_nextPL,
		criticalFlag := 0,
		reserved := c_uInt7Zero,
		payloadLength := 8,
		protocolId := p_protoID,
		spiSize := 0,
		notifyMessageType := p_notifyType,
		spi := omit,
		data := omit
		}
		}


		template IkePayload mw_notifyPL := {
		notify := {
		nextPayload := ?,