Commit 38b07f4d authored by schmitting's avatar schmitting
Browse files

CREATE_CHILD_SA functions added

parent 4e686a7f
Loading
Loading
Loading
Loading
+1270 −115

File changed.

Preview size limit exceeded, changes collapsed.

+53 −10
Original line number Diff line number Diff line
@@ -335,7 +335,7 @@

	}//end group ikeAuthResponseTemplates

	group ikeCreateChildSaRequestTemplates {
	group createChildSaRequestTemplates {

		template CreateChildSaRequest mw_createChildSaReq (template Ipv6Address p_src,
													  	   template Ipv6Address p_dst,
@@ -416,11 +416,11 @@
			}
		}

	}//end group ikeChildSaRequestTemplates
	}//end group childSaRequestTemplates

	group ikeChildSaResponseTemplates {
	group childSaResponseTemplates {

		template CreateChildSaResponse mw_createChildSaRes (template Ipv6Address p_src,
		template CreateChildSaResponse mw_createChildSaRsp (template Ipv6Address p_src,
													  	    template Ipv6Address p_dst,
														    UInt16 p_udpSourcePort,
														    UInt16 p_udpDestPort,
@@ -458,7 +458,7 @@
			}}
		}

	template CreateChildSaResponse m_createChildSaRes (template Ipv6Address p_src,
	template CreateChildSaResponse m_createChildSaRsp (template Ipv6Address p_src,
													   template Ipv6Address p_dst,
													   UInt16 p_udpsourcePort,
													   UInt16 p_udpdestPort,
@@ -499,7 +499,7 @@
			}
		}

	}//end group ikeChildSaResponseTemplates
	}//end group childSaResponseTemplates

	group informationalRequestTemplates {

@@ -585,7 +585,7 @@
	}//end group informationalRequestTemplates
	group informationalResponseTemplates {

		template InformationalResponse mw_informationalRes (template Ipv6Address p_src,
		template InformationalResponse mw_informationalRsp (template Ipv6Address p_src,
													 template Ipv6Address p_dst,
													 UInt16 p_udpSourcePort,
													 UInt16 p_udpDestPort,
@@ -623,7 +623,7 @@
			}}
		}

	template InformationalResponse m_informationalRes (template Ipv6Address p_src,
	template InformationalResponse m_informationalRsp (template Ipv6Address p_src,
												template Ipv6Address p_dst,
												UInt16 p_udpsourcePort,
												UInt16 p_udpdestPort,
@@ -687,7 +687,8 @@
				   mw_tsResponderPL, mw_authPL, mw_notifyPL(c_notifyUseTransportMode));

		template IkePayloadList mw_ikeAuthRspPLL :=
		superset ( mw_securityAssociationPL, mw_idResponderPL, mw_tsInitiatorPL, mw_tsResponderPL, mw_authPL);
		superset ( mw_securityAssociationPL, mw_idResponderPL, mw_tsInitiatorPL,
				   mw_tsResponderPL, mw_authPL);

		template IkePayloadList mw_ikeAuthRspTransportModePLL :=
		superset ( mw_securityAssociationPL, mw_idResponderPL, mw_tsInitiatorPL,
@@ -699,10 +700,27 @@
		template IkePayloadList mw_createChildSaReqPLL :=
		superset ( mw_securityAssociationPL, mw_noncePL, mw_tsInitiatorPL, mw_tsResponderPL);

		template IkePayloadList mw_createChildSaReqTransportModePLL :=
		template IkePayloadList mw_createChildSaReqRekeySaPLL :=
		superset ( mw_securityAssociationPL, mw_noncePL, mw_tsInitiatorPL, mw_tsResponderPL,
				   mw_notifyPL(c_notifyRekeySa));

		template IkePayloadList mw_createChildSaReqRekeySaTransportModePLL :=
		superset ( mw_securityAssociationPL, mw_noncePL, mw_tsInitiatorPL, mw_tsResponderPL, 
				   mw_notifyPL(c_notifyUseTransportMode), mw_notifyPL(c_notifyRekeySa));

		template IkePayloadList mw_createChildSaReqRekeyIkePLL :=
		superset ( mw_securityAssociationPL, mw_noncePL, mw_notifyPL(c_notifyRekeySa));

		template IkePayloadList mw_createChildSaRspPLL :=
		superset ( mw_securityAssociationPL, mw_noncePL, mw_tsInitiatorPL, mw_tsResponderPL);

		template IkePayloadList mw_createChildSaRspTransportModePLL :=
		superset ( mw_securityAssociationPL, mw_noncePL, mw_tsInitiatorPL, mw_tsResponderPL,
				   mw_notifyPL(c_notifyUseTransportMode));

		template IkePayloadList mw_createChildSaRsp_Notify :=
		superset ( mw_notifyAnyPL);

		}//end group payLoadListTemplates

	group ikeSecurityAssociationPayloadTemplates {
@@ -953,6 +971,31 @@ group payloadTemplates {
			p_ikePayload6
	}

	/*
	 *	@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	 
	 *	@param  p_ikePayload7 Seventh element in IkePayloadList	 
	*/
	template IkePayloadList m_ikePlList_7Elem(
		template IkePayload p_ikePayload1,
		template IkePayload p_ikePayload2,
		template IkePayload p_ikePayload3,
		template IkePayload p_ikePayload4,
		template IkePayload p_ikePayload5,
		template IkePayload p_ikePayload6,
		template IkePayload p_ikePayload7) := {
			p_ikePayload1,
			p_ikePayload2,
			p_ikePayload3,
			p_ikePayload4,
			p_ikePayload5,
			p_ikePayload6,
			p_ikePayload7
	}

	group ikeKeyExchangePayloadTemplates {

+7 −7
Original line number Diff line number Diff line
@@ -1095,15 +1095,15 @@
			octetstring diffieHellmanPrivKey,
			octetstring diffieHellmanSharedSecret,
			SevenSecrets sevenSecrets optional,
			octetstring nI,//new smu nonce
			octetstring nR,//new smu nonce
			UInt8 proposalNr,//new smu nonce
			octetstring nI,// nonce initiator
			octetstring nR,// nonce responder
			UInt8 proposalNr,
			UInt16 udpTnPort, // UDP port of test node (TN)
			UInt16 udpIutPort, // UDP port of IUT
			octetstring iDi, //new ps identification initiator
			octetstring iDr, //new ps identification responder
			Ikev2Header ikev2Header optional, //new ps IKEv2 header from IKE_SA_INIT message
			IkePayloadList ikePayloadList optional //new ps IKEv2 payload list from IKE_SA_INIT message
			octetstring iDi, // identification initiator
			octetstring iDr, // identification responder
			Ikev2Header ikev2Header optional, // IKEv2 header from IKE_SA_INIT message
			IkePayloadList ikePayloadList optional // IKEv2 payload list from IKE_SA_INIT message
		}
		with {
			variant "noCodec";