Commit 76c21ec2 authored by berge's avatar berge
Browse files

Some validation changes.

parent 55295945

ttcn3/EtsiLibrary/LibIpv6/LibCommonRfcs/LibIpv6_CommonRfcs_Functions.ttcn

+2 −1
Original line number Original line Diff line number Diff line
@@ -708,7 +708,8 @@ group ipSecFns { 
			vc_ikeSad[0] := {

			vc_ikeSad[0] := {

				spiInitiator := PX_IKE_SPI,

				spiInitiator := PX_IKE_SPI,

				spiResponder := PX_IKE_SPI,

				spiResponder := PX_IKE_SPI,

				messageID := 0,

				messageIdTn := 0,

				messageIdIut := 0,

				ikeEncryptionAlgo := PX_IKE_ENCALGO,

				ikeEncryptionAlgo := PX_IKE_ENCALGO,

				ikeEncrKeyLen := omit,

				ikeEncrKeyLen := omit,

				ikeIv := omit,

				ikeIv := omit,

ttcn3/EtsiLibrary/LibIpv6/LibSec/LibIpv6_Rfc4306Ikev2_Functions.ttcn

+357 −885

File changed.

Preview size limit exceeded, changes collapsed.

ttcn3/EtsiLibrary/LibIpv6/LibSec/LibIpv6_Rfc4306Ikev2_Templates.ttcn

+6 −6
Original line number Original line Diff line number Diff line
@@ -592,7 +592,7 @@ 
					minorVersion  := c_ikeMinorVersion0,

					minorVersion  := c_ikeMinorVersion0,

					exchangeType  := c_createChildSa,

					exchangeType  := c_createChildSa,

					twoXFlags     := ?,

					twoXFlags     := ?,

					rFlag         := c_rFlagRequest,

					rFlag         := c_rFlagResponse,

					vFlag         := c_vFlag,

					vFlag         := c_vFlag,

					iFlag         := p_iFlag,

					iFlag         := p_iFlag,

					threeXFlags   := ?,

					threeXFlags   := ?,
@@ -629,7 +629,7 @@ 
					minorVersion  := c_ikeMinorVersion0,

					minorVersion  := c_ikeMinorVersion0,

					exchangeType  := c_createChildSa,

					exchangeType  := c_createChildSa,

					twoXFlags     := ?,

					twoXFlags     := ?,

					rFlag         := c_rFlagRequest,

					rFlag         := c_rFlagResponse,

					vFlag         := c_vFlagSet,

					vFlag         := c_vFlagSet,

					iFlag         := p_iFlag,

					iFlag         := p_iFlag,

					threeXFlags   := ?,

					threeXFlags   := ?,
@@ -669,7 +669,7 @@ 
						minorVersion  := c_ikeMinorVersion0,

						minorVersion  := c_ikeMinorVersion0,

						exchangeType  := c_createChildSa,

						exchangeType  := c_createChildSa,

						twoXFlags     := 0,

						twoXFlags     := 0,

						rFlag         := c_rFlagRequest,

						rFlag         := c_rFlagResponse,

						vFlag         := c_vFlag,

						vFlag         := c_vFlag,

						iFlag         := p_iFlag,

						iFlag         := p_iFlag,

						threeXFlags   := 0,

						threeXFlags   := 0,
@@ -1375,14 +1375,14 @@ group payloadTemplates { 
			}

			}

		} 

		} 





		template IkePayload m_notifyPL_SPI(UInt8 p_nextPL, UInt8 p_protoID, UInt16 p_notifyType, octetstring p_spi ) := {

		template IkePayload m_notifyPL_SPI(UInt8 p_nextPL, UInt8 p_protoID, UInt16 p_notifyType, UInt8 p_spiSize, octetstring p_spi ) := {

			notify := {

			notify := {

				nextPayload       := p_nextPL,

				nextPayload       := p_nextPL,

				criticalFlag      := 0,

				criticalFlag      := 0,

				reserved          := c_uInt7Zero,

				reserved          := c_uInt7Zero,

				payloadLength     := 12,

				payloadLength     := 12,

				protocolId        := p_protoID,

				protocolId        := p_protoID,

				spiSize           := 4,

				spiSize           := p_spiSize,

				notifyMessageType := p_notifyType,

				notifyMessageType := p_notifyType,

				spi               := p_spi,

				spi               := p_spi,

				data              := omit

				data              := omit
@@ -1592,7 +1592,7 @@ group identificationPLTmplts { 
					nextPayload	 := p_nextPayload,

					nextPayload	 := p_nextPayload,

					criticalFlag := 0,

					criticalFlag := 0,

					reserved	 := c_uInt7Zero,

					reserved	 := c_uInt7Zero,

					payloadLength := 8,

					payloadLength := 8 + (c_spiSize4 * 1), //nb of spi

					protocolId   := p_protocolId,

					protocolId   := p_protocolId,

					spiSize      := c_spiSize4,

					spiSize      := c_spiSize4,

					numberOfSpi  := 1,

					numberOfSpi  := 1,

ttcn3/EtsiLibrary/LibIpv6/LibSec/LibIpv6_Rfc4306Ikev2_TypesAndValues.ttcn

+2 −1
Original line number Original line Diff line number Diff line
@@ -1084,7 +1084,8 @@ 
		type record IkeSa {

		type record IkeSa {

			Oct8 spiInitiator,

			Oct8 spiInitiator,

			Oct8 spiResponder,

			Oct8 spiResponder,

			UInt32 messageID,

			UInt32 messageIdTn,

			UInt32 messageIdIut,

			EncryptionAlgo ikeEncryptionAlgo,

			EncryptionAlgo ikeEncryptionAlgo,

			//octetstring	ikeEncryptionKey,

			//octetstring	ikeEncryptionKey,

			UInt16 ikeEncrKeyLen optional,

			UInt16 ikeEncrKeyLen optional,