Commit 4eb41bfd authored by schmitting's avatar schmitting
Browse files

SEC TCs added

parent 6fb6ffcc

ttcn3/EtsiLibrary/LibIpv6/LibSec/LibIpv6_Rfc4306Ikev2_Functions.ttcn

+6 −6
Original line number Diff line number Diff line
@@ -593,7 +593,7 @@ module LibIpv6_Rfc4306Ikev2_Functions { 
					// put data from first proposal into vc_ikeSad

					// store encryption algorithm

					{ 	

						v_ret := f_getTransformOfType(v_ikePayload.securityAssociation.saProposalList,

						v_ret_local := f_getTransformOfType(v_ikePayload.securityAssociation.saProposalList,

													  		c_transformTypeEncr,v_saTransform);

						if (v_ret_local == e_success)

						{vc_ikeSad[0].ikeEncryptionAlgo := v_saTransform.transformId.encryptionAlgo;
@@ -3360,8 +3360,8 @@ group sendRequests { 
		in template Ipv6Address p_addrIut,

		in template Ipv6Address p_addrTunnelStart,

		in template Ipv6Address p_addrTunnelEnd,

		UInt1 						p_iFlag,

		UInt8 						p_protocolId,

		in UInt1 				p_iFlag,

		in UInt8 				p_protocolId,

		out CreateChildSaRequest 	p_createChildSaReq

	)

	runs on LibIpv6Node {
@@ -3464,7 +3464,7 @@ group sendRequests { 
			v_ikeDst := valueof(p_addrTunnelEnd);

		}



		// Transport mode, Notify payload requesting 'UseTransportMode' is included in IKE_AUTH request

		// Transport mode, Notify payload requesting 'UseTransportMode' is included in CREATE_CHILD_SA request

		if(vc_sad[c_saIni].ipSecProtocolMode == e_transportMode)

		{

			p_createChildSaReq := valueof (
@@ -3517,7 +3517,7 @@ group sendRequests { 
			);

		}



		// Tunnel mode, Notify payload requesting 'UseTransportMode' is not included in IKE_AUTH request

		// Tunnel mode, Notify payload requesting 'UseTransportMode' is not included in CREATE_CHILD_SA request

		else

		{

			p_createChildSaReq := valueof (

ttcn3/EtsiLibrary/LibIpv6/LibSec/LibIpv6_Rfc4306Ikev2_Templates.ttcn

+59 −12
Original line number Diff line number Diff line
@@ -964,6 +964,10 @@ 
		template IkePayloadList mw_ikeSaInitReqPLL :=

		superset ( mw_securityAssociationIkePL, mw_noncePL, mw_keyExchangePL);



		template IkePayloadList mw_ikeSaInitReqPLL_cookie(octetstring p_cookie) :=

		superset ( mw_securityAssociationIkePL, mw_noncePL, mw_keyExchangePL,

				   mw_notifyPL_cookie(p_cookie));



		template IkePayloadList mw_ikeSaInitRspPLL :=

		superset ( mw_securityAssociationIkePL, mw_noncePL, mw_keyExchangePL);
@@ -1367,15 +1371,29 @@ group payloadTemplates { 
				nextPayload       := p_nextPL,

				criticalFlag      := 0,

				reserved          := c_uInt7Zero,

				payloadLength     := 8,

				payloadLength     := 12,

				protocolId        := p_protoID,

				spiSize           := 0,

				spiSize           := 4,

				notifyMessageType := p_notifyType,

				spi               := p_spi,

				data              := omit

			}

		} 



		template IkePayload m_notifyPL_cookie(octetstring p_data) := {

			notify := {

				nextPayload       := c_noNextPL,

				criticalFlag      := 0,

				reserved          := c_uInt7Zero,

				payloadLength     := lengthof(p_data) + 8,

				protocolId        := c_protocolIke,

				spiSize           := 0,

				notifyMessageType := c_notifyCookie,

				spi               := omit,

				data              := p_data

			}

		} 



	template IkePayload mw_notifyPL(UInt16 p_notifyMessageType) := {

			notify := {

				nextPayload       := ?,
@@ -1404,6 +1422,20 @@ group payloadTemplates { 
			}

		} 



		template IkePayload mw_notifyPL_cookie(octetstring p_data) := {

			notify := {

				nextPayload       := ?,

				criticalFlag      := 0,

				reserved          := ?,

				payloadLength     := ?,

				protocolId        := c_protocolIke,

				spiSize           := 0,

				notifyMessageType := c_notifyCookie,

				spi               := omit,

				data              := p_data

			}

		} 



	}//end group ikeNotifyPayloadTemplates



	group vendorIdPayloadTemplates {
@@ -1779,6 +1811,21 @@ group cfgPLTmplts { 


}//end cfgPLTmplts



group unrecognisedPLTmplts {



	// Nonce payload is made "unrecognised" by nextPayload field of previous payload

	template IkePayload m_unrecognisedPL(UInt1 p_criticalFlag) := {

		nonce := {

			nextPayload   := c_noNextPL,

			criticalFlag  := p_criticalFlag,

			reserved      := c_uInt7Zero,

			payloadLength := 20,

			data          := '00112233445566778899AABBCCDDEEFF'O

		}

	} 



} // end group unrecognisedPLTmplts



}//end payloadTemplates

ttcn3/EtsiLibrary/LibIpv6/LibSec/LibIpv6_Rfc4306Ikev2_TypesAndValues.ttcn

+2 −0
Original line number Diff line number Diff line
@@ -126,6 +126,8 @@ 
			const UInt1	c_rFlagResponse		:= 1;

			const UInt1	c_vFlag		 		:= 0;

			const UInt1	c_vFlagSet		 	:= 1;

			const UInt1	c_cFlagNotCritical	:= 0;

			const UInt1	c_cFlagCritical	 	:= 1;

			const UInt1	c_iFlagResponder	:= 0;

			const UInt1	c_iFlagInitiator 	:= 1;

		} // end group IkeRfc4306FlagsTypes